From 18aab10dfe6ff48d288a4849beb1a80bd58cf1bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophile=20Diot?= <tdiot@bunkerity.com>
Date: Wed, 22 Nov 2023 10:18:41 +0000
Subject: [PATCH] Update Firefox installation in Linux workflows

---
 .github/workflows/test-core-linux.yml | 15 ++++++++-------
 .github/workflows/tests-ui-linux.yml  | 15 ++++++++-------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/test-core-linux.yml b/.github/workflows/test-core-linux.yml
index 48ad3862..5139b0ce 100644
--- a/.github/workflows/test-core-linux.yml
+++ b/.github/workflows/test-core-linux.yml
@@ -25,13 +25,14 @@ jobs:
         run: |
           sudo apt purge -y 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
-          wget -O firefox-setup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64"
-          sudo tar -xjf firefox-setup.tar.bz2 -C /opt/
-          sudo rm -f /usr/bin/firefox
-          sudo ln -s /opt/firefox/firefox /usr/bin/firefox
-          sudo chmod 755 /opt/firefox /opt/firefox/firefox
-          rm -f firefox-setup.tar.bz2
+          sudo add-apt-repository ppa:mozillateam/ppa -y
+          echo '
+          Package: *
+          Pin: release o=LP-PPA-mozillateam
+          Pin-Priority: 1001
+          ' | 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
         with:
diff --git a/.github/workflows/tests-ui-linux.yml b/.github/workflows/tests-ui-linux.yml
index eb380fb6..2bae1802 100644
--- a/.github/workflows/tests-ui-linux.yml
+++ b/.github/workflows/tests-ui-linux.yml
@@ -22,13 +22,14 @@ jobs:
         run: |
           sudo apt purge -y firefox
           sudo apt update
-          sudo apt install --no-install-recommends -y zip nodejs tar bzip2 wget curl grep libx11-xcb1 libappindicator3-1 libasound2 libdbus-glib-1-2 libxtst6 libxt6
-          wget -O firefox-setup.tar.bz2 "https://download.mozilla.org/?product=firefox-latest-ssl&os=linux64"
-          sudo tar -xjf firefox-setup.tar.bz2 -C /opt/
-          sudo rm -f /usr/bin/firefox
-          sudo ln -s /opt/firefox/firefox /usr/bin/firefox
-          sudo chmod 755 /opt/firefox /opt/firefox/firefox
-          rm -f firefox-setup.tar.bz2
+          sudo add-apt-repository ppa:mozillateam/ppa -y
+          echo '
+          Package: *
+          Pin: release o=LP-PPA-mozillateam
+          Pin-Priority: 1001
+          ' | 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
         with: