diff --git a/.github/workflows/test-core-linux.yml b/.github/workflows/test-core-linux.yml index 616eca382f..e3906fc9d6 100644 --- a/.github/workflows/test-core-linux.yml +++ b/.github/workflows/test-core-linux.yml @@ -23,15 +23,17 @@ jobs: python-version: "3.11" - name: Install Firefox manually and dependencies run: | - sudo apt purge -y firefox - sudo apt update sudo add-apt-repository ppa:mozillateam/ppa -y + sudo apt purge -y firefox echo ' Package: * Pin: release o=LP-PPA-mozillateam Pin-Priority: 1001 + + Package: firefox + Pin: version 1:1snap1-0ubuntu2 + Pin-Priority: -1 ' | sudo tee /etc/apt/preferences.d/mozilla-firefox - sudo apt update sudo apt install --no-install-recommends -y openssl git nodejs tar bzip2 wget curl grep libx11-xcb1 libappindicator3-1 libasound2 libdbus-glib-1-2 libxtst6 libxt6 php-fpm unzip firefox - name: Download geckodriver uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0 @@ -57,7 +59,7 @@ jobs: container_id=$(docker create "ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}") docker cp "$container_id:/opt/bunkerweb_${{ inputs.RELEASE }}-1_amd64.deb" "/tmp/bunkerweb.deb" docker rm "$container_id" - - name: Install BunkerWeb + - name: Install NGINX run: | sudo apt install -y gnupg2 ca-certificates lsb-release ubuntu-keyring curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null diff --git a/.github/workflows/tests-ui-linux.yml b/.github/workflows/tests-ui-linux.yml index be47fa7d50..5e2ac2b6d1 100644 --- a/.github/workflows/tests-ui-linux.yml +++ b/.github/workflows/tests-ui-linux.yml @@ -20,15 +20,17 @@ jobs: python-version: "3.11" - name: Install Firefox manually and dependencies run: | - sudo apt purge -y firefox - sudo apt update sudo add-apt-repository ppa:mozillateam/ppa -y + sudo apt purge -y firefox echo ' Package: * Pin: release o=LP-PPA-mozillateam Pin-Priority: 1001 + + Package: firefox + Pin: version 1:1snap1-0ubuntu2 + Pin-Priority: -1 ' | sudo tee /etc/apt/preferences.d/mozilla-firefox - sudo apt update sudo apt install --no-install-recommends -y openssl git nodejs tar bzip2 wget curl grep libx11-xcb1 libappindicator3-1 libasound2 libdbus-glib-1-2 libxtst6 libxt6 php-fpm unzip firefox - name: Download geckodriver uses: nick-fields/retry@14672906e672a08bd6eeb15720e9ed3ce869cdd4 # v2.9.0 @@ -54,7 +56,7 @@ jobs: container_id=$(docker create "ghcr.io/bunkerity/ubuntu-tests:${{ inputs.RELEASE }}") docker cp "$container_id:/opt/bunkerweb_${{ inputs.RELEASE }}-1_amd64.deb" "/tmp/bunkerweb.deb" docker rm "$container_id" - - name: Install BunkerWeb + - name: Install NGINX run: | sudo apt install -y gnupg2 ca-certificates lsb-release ubuntu-keyring curl https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx-archive-keyring.gpg >/dev/null