mirror of
https://github.com/nextcloud/nextcloudpi.git
synced 2026-01-10 15:12:01 -03:30
build-lxd.yml: Always use firefox from packages on arm64
This commit is contained in:
parent
f4ecb35f35
commit
ced59fe09d
6
.github/workflows/build-lxd.yml
vendored
6
.github/workflows/build-lxd.yml
vendored
@ -364,11 +364,12 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: "v1.54.3"
|
ref: "v1.54.3"
|
||||||
- name: Setup Firefox
|
- name: Setup Firefox
|
||||||
|
if: ${{ runner.arch != 'ARM64' }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
id: setup-firefox-browser-action
|
id: setup-firefox-browser-action
|
||||||
uses: browser-actions/setup-firefox@latest
|
uses: browser-actions/setup-firefox@latest
|
||||||
- name: Setup Firefox from packages
|
- name: Setup Firefox from packages
|
||||||
if: ${{ steps.setup-firefox-browser-action.outcome == 'failure' }}
|
if: ${{ runner.arch == 'ARM64' || steps.setup-firefox-browser-action.outcome == 'failure' }}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends firefox
|
sudo apt-get install -y --no-install-recommends firefox
|
||||||
@ -641,11 +642,12 @@ jobs:
|
|||||||
sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
|
sudo iptables -I DOCKER-USER -o incusbr0 -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
|
||||||
sudo incus admin init --auto
|
sudo incus admin init --auto
|
||||||
- name: Setup Firefox
|
- name: Setup Firefox
|
||||||
|
if: ${{ runner.arch != 'ARM64' }}
|
||||||
continue-on-error: true
|
continue-on-error: true
|
||||||
id: setup-firefox-browser-action
|
id: setup-firefox-browser-action
|
||||||
uses: browser-actions/setup-firefox@latest
|
uses: browser-actions/setup-firefox@latest
|
||||||
- name: Setup Firefox from packages
|
- name: Setup Firefox from packages
|
||||||
if: ${{ steps.setup-firefox-browser-action.outcome == 'failure' }}
|
if: ${{ runner.arch == 'ARM64' || steps.setup-firefox-browser-action.outcome == 'failure' }}
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y --no-install-recommends firefox
|
sudo apt-get install -y --no-install-recommends firefox
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user