Skip to content

Commit bd9d73c

Browse files
committed
build-lxd.yml: Fix firefox installation on arm64
Signed-off-by: Tobias K <6317548+theCalcaholic@users.noreply.github.com>
1 parent 994dcfd commit bd9d73c

1 file changed

Lines changed: 12 additions & 15 deletions

File tree

.github/workflows/build-lxd.yml

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ jobs:
4040
run: |
4141
if [[ "${LXD_ARCH}" == "arm64" ]]
4242
then
43-
RUNNER_LABEL='["ubuntu-20.04", "ARM64"]'
43+
RUNNER_LABEL="ubuntu-20.04-arm64"
4444
else
45-
RUNNER_LABEL='["ubuntu-20.04"]'
45+
RUNNER_LABEL="ubuntu-20.04"
4646
fi
4747
echo "runner_label=$RUNNER_LABEL" | tee -a $GITHUB_OUTPUT
4848
4949
build-current:
5050
needs:
5151
- determine-runner
52-
runs-on: ${{ fromJSON(needs.determine-runner.outputs.runner_label) }}
52+
runs-on: ${{ needs.determine-runner.outputs.runner_label }}
5353
outputs:
5454
artifact_name: "${{ env.ARTIFACT_NAME }}"
5555
artifact_file: "${{ steps.pack-lxd.outputs.artifact_file }}"
@@ -79,7 +79,7 @@ jobs:
7979
id: pack-lxd
8080
run: |
8181
. ./build/buildlib.sh
82-
ARTIFACT_FILE="NextCloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
82+
ARTIFACT_FILE="NextcloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
8383
lxc image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
8484
echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
8585
- name: upload LXD image to artifact store
@@ -149,7 +149,7 @@ jobs:
149149
id: pack-lxd
150150
run: |
151151
. ./build/buildlib.sh
152-
ARTIFACT_FILE="NextCloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
152+
ARTIFACT_FILE="NextcloudPi_LXD_${LXD_ARCH:-x86}_${VERSION//\//_}"
153153
lxc image export -q ncp/"${version}" "output/${ARTIFACT_FILE}"
154154
echo "artifact_file=${ARTIFACT_FILE}.tar.gz" >> $GITHUB_OUTPUT
155155
- name: upload LXD image to artifact store
@@ -183,7 +183,13 @@ jobs:
183183
with:
184184
ref: "${{ env.VERSION }}"
185185
- name: Setup Firefox
186+
continue-on-error: true
187+
id: setup-firefox-browser-action
186188
uses: browser-actions/setup-firefox@latest
189+
- name: Setup Firefox from packages
190+
if: ${{ steps.setup-firefox-browser-action.outcome == 'failure' }}
191+
run: |
192+
sudo apt-get install -y --no-install-recommends firefox
187193
- name: Setup GeckoDriver
188194
uses: ChlodAlejandro/setup-geckodriver@latest
189195
with:
@@ -249,15 +255,6 @@ jobs:
249255
working-directory: ./tests
250256
run: |
251257
lxc exec ncp -- bash -c 'tail -f /var/log/ncp.log' |& awk '{ print "NCP::" $0 }' &
252-
python activation_tests.py --no-gui "nextcloudpi.local" 443 4443 || {
253-
echo "Activation test failed!"
254-
echo "Geckodriver logs:"
255-
tail -n 20 geckodriver.log >&2 || true
256-
echo "================"
257-
echo "ncp.log: "
258-
lxc exec ncp -- "tail -n20 /var/log/ncp.log"
259-
exit 1
260-
}
261258
python system_tests.py --non-interactive || {
262259
echo "System test failed!"
263260
exit 1
@@ -277,7 +274,7 @@ jobs:
277274
needs:
278275
- determine-runner
279276
- build-current
280-
runs-on: ${{ fromJSON(needs.determine-runner.outputs.runner_label) }}
277+
runs-on: ${{ needs.determine-runner.outputs.runner_label }}
281278
env:
282279
VERSION: "${{ inputs.git_ref || github.head_ref || github.ref_name }}"
283280
ARTIFACT_NAME: ${{ needs.build-current.outputs.artifact_name }}

0 commit comments

Comments
 (0)