Skip to content

Commit 58f6e24

Browse files
authored
Fix installation of kerberos module on armv7l (#6442)
Also build with the same version of Node we will release with.
1 parent 7868f4d commit 58f6e24

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

.github/workflows/release.yaml

+15-2
Original file line numberDiff line numberDiff line change
@@ -129,19 +129,32 @@ jobs:
129129
- name: Install Node.js v18
130130
uses: actions/setup-node@v3
131131
with:
132-
node-version: "18"
132+
node-version: "18.15.0"
133133

134134
- name: Install nfpm
135135
run: |
136136
mkdir -p ~/.local/bin
137137
curl -sSfL https://github.com/goreleaser/nfpm/releases/download/v2.3.1/nfpm_2.3.1_`uname -s`_`uname -m`.tar.gz | tar -C ~/.local/bin -zxv nfpm
138138
echo "$HOME/.local/bin" >> $GITHUB_PATH
139139
140-
- name: Install cross-compiler and system dependencies
140+
- name: Install cross-compiler and system dependencies (arm64)
141+
if: ${{ matrix.arch != 'armv7l' }}
141142
run: sudo apt update && sudo apt install -y $PACKAGE libkrb5-dev
142143
env:
143144
PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
144145

146+
- name: Install cross-compiler and system dependencies (armv7l)
147+
if: ${{ matrix.arch == 'armv7l' }}
148+
run: |
149+
sudo sed -i "s/^deb/deb [arch=amd64,i386]/g" /etc/apt/sources.list
150+
echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ $(lsb_release -s -c) main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
151+
echo "deb [arch=arm64,armhf] http://ports.ubuntu.com/ $(lsb_release -s -c)-updates main universe multiverse restricted" | sudo tee -a /etc/apt/sources.list
152+
sudo dpkg --add-architecture armhf
153+
sudo apt update
154+
sudo apt install -y $PACKAGE libkrb5-dev:armhf
155+
env:
156+
PACKAGE: ${{ format('g++-{0}', matrix.prefix) }}
157+
145158
- name: Download npm package
146159
uses: actions/download-artifact@v3
147160
with:

patches/series

-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,3 @@ display-language.diff
2020
cli-window-open.diff
2121
getting-started.diff
2222
safari.diff
23-
dependencies.diff

0 commit comments

Comments
 (0)