From 34c17f8218075552e06d8a02b526f09df70cf6c2 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Wed, 28 Aug 2024 17:30:25 +0200 Subject: [PATCH 01/18] Trigger test --- test-root | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test-root diff --git a/test-root b/test-root new file mode 100644 index 0000000000000..e69de29bb2d1d From e9ed8722eb80d7a63df57c32c6497d4c289c4ff2 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 29 Aug 2024 13:32:20 +0200 Subject: [PATCH 02/18] Disabled new svg tests --- test-root | 1 + 1 file changed, 1 insertion(+) diff --git a/test-root b/test-root index e69de29bb2d1d..176e7710fa88c 100644 --- a/test-root +++ b/test-root @@ -0,0 +1 @@ +Test without new svg \ No newline at end of file From a3dda1ee26fc299bbb11ba7ea9a991e5ac3eb55d Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 29 Aug 2024 13:50:57 +0200 Subject: [PATCH 03/18] Testing root CI --- .github/workflows/root-ci-config/build_root.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py index 4559622b7528c..96b0ef269ea25 100755 --- a/.github/workflows/root-ci-config/build_root.py +++ b/.github/workflows/root-ci-config/build_root.py @@ -434,7 +434,10 @@ def rebase(directory: str, repository:str, base_ref: str, head_ref: str, head_sh git config user.name 'ROOT Continous Integration' git fetch {repository} {branch} - git checkout {head_ref} + git checkout {head_ref} -f + git status + git diff + git reset --hard git rebase {base_ref} """) From 026cb52d4b5fd03bd98de0aa2631c5a3f9e98b7f Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 29 Aug 2024 16:33:22 +0200 Subject: [PATCH 04/18] Installing chrome in ROOT CI --- .github/workflows/root-ci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 1af2addfa21cf..434d10a73531c 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -121,6 +121,10 @@ jobs: with: ref: ${{ inputs.ref_name }} + - name: Install chrome + run: | + brew install --cask google-chrome + - name: Apply option overrides from matrix for this job for non-release builds if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && matrix.overrides != NaN }} env: @@ -414,6 +418,15 @@ jobs: uses: actions/checkout@v4 with: ref: ${{ inputs.ref_name }} + + - name: Install chrome + run: | + sudo apt-get update + sudo apt-get install -y wget gnupg + wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' + sudo apt-get update + sudo apt-get install -y google-chrome-stable - name: Dump GitHub context env: From 5bfea323afa94ba150c2d7aaec5d3e65bf2b2def Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Fri, 30 Aug 2024 11:00:29 +0200 Subject: [PATCH 05/18] Disableing chrome in ROOT CI --- .github/workflows/root-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 434d10a73531c..300eeb00edc1c 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -121,9 +121,9 @@ jobs: with: ref: ${{ inputs.ref_name }} - - name: Install chrome - run: | - brew install --cask google-chrome + # - name: Install chrome + # run: | + # brew install --cask google-chrome - name: Apply option overrides from matrix for this job for non-release builds if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && matrix.overrides != NaN }} @@ -419,14 +419,14 @@ jobs: with: ref: ${{ inputs.ref_name }} - - name: Install chrome - run: | - sudo apt-get update - sudo apt-get install -y wget gnupg - wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' - sudo apt-get update - sudo apt-get install -y google-chrome-stable + # - name: Install chrome + # run: | + # sudo apt-get update + # sudo apt-get install -y wget gnupg + # wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - + # sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' + # sudo apt-get update + # sudo apt-get install -y google-chrome-stable - name: Dump GitHub context env: From cdb5bc344d0d067c1523288f584378420e347932 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Fri, 30 Aug 2024 17:05:01 +0200 Subject: [PATCH 06/18] Deleted ref files with small letters --- test-root | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test-root b/test-root index 176e7710fa88c..aa2d7c7737460 100644 --- a/test-root +++ b/test-root @@ -1 +1 @@ -Test without new svg \ No newline at end of file +Test without new svg and deleted reference files with small letters \ No newline at end of file From e2e2ea5555ad4a50cb4e4fb473aa7940ad6af77c Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Mon, 2 Sep 2024 11:02:40 +0200 Subject: [PATCH 07/18] Installing chrome on linux with Action --- .github/workflows/root-ci.yml | 16 +++++++++++----- test-root | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 300eeb00edc1c..e6465e05ae5b6 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -421,12 +421,18 @@ jobs: # - name: Install chrome # run: | - # sudo apt-get update - # sudo apt-get install -y wget gnupg + # apt-get update + # apt-get install -y wget gnupg # wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - # sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' - # sudo apt-get update - # sudo apt-get install -y google-chrome-stable + # sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' + # apt-get update + # apt-get install -y google-chrome-stable + + - name: Install chrome + uses: browser-actions/setup-chrome@v1 + with: + chrome-version: 120 + install-dependencies: true - name: Dump GitHub context env: diff --git a/test-root b/test-root index aa2d7c7737460..176e7710fa88c 100644 --- a/test-root +++ b/test-root @@ -1 +1 @@ -Test without new svg and deleted reference files with small letters \ No newline at end of file +Test without new svg \ No newline at end of file From 3f977bddd99455cd2420c5610576558f79a4bb4e Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Mon, 2 Sep 2024 11:29:11 +0200 Subject: [PATCH 08/18] Chrome and homebrew installation on MAC --- .github/workflows/root-ci.yml | 24 ++++++++++++++++-------- test-root | 1 - 2 files changed, 16 insertions(+), 9 deletions(-) delete mode 100644 test-root diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index e6465e05ae5b6..7ad7763a40cfb 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -121,9 +121,17 @@ jobs: with: ref: ${{ inputs.ref_name }} - # - name: Install chrome - # run: | - # brew install --cask google-chrome + - name: Install Homebrew + run: | + /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + + - name: Verify Installation + run: | + brew --version + + - name: Install chrome + run: | + brew install --cask google-chrome - name: Apply option overrides from matrix for this job for non-release builds if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && matrix.overrides != NaN }} @@ -428,11 +436,11 @@ jobs: # apt-get update # apt-get install -y google-chrome-stable - - name: Install chrome - uses: browser-actions/setup-chrome@v1 - with: - chrome-version: 120 - install-dependencies: true + # - name: Install chrome + # uses: browser-actions/setup-chrome@v1 + # with: + # chrome-version: 120 + # install-dependencies: true - name: Dump GitHub context env: diff --git a/test-root b/test-root deleted file mode 100644 index 176e7710fa88c..0000000000000 --- a/test-root +++ /dev/null @@ -1 +0,0 @@ -Test without new svg \ No newline at end of file From fe00330db59bb52a06f03885eabe6d69fd7cca35 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Mon, 2 Sep 2024 12:02:59 +0200 Subject: [PATCH 09/18] Chrome and homebrew installation on MAC including sudo --- .github/workflows/root-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 7ad7763a40cfb..011db12ff7891 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -123,7 +123,7 @@ jobs: - name: Install Homebrew run: | - /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + sudo /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - name: Verify Installation run: | From 560f01384659976bad9f0af9f8b9c64441193b21 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Tue, 3 Sep 2024 08:57:21 +0200 Subject: [PATCH 10/18] Chrome instalations linux based platforms --- .github/workflows/root-ci.yml | 57 +++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 23 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 011db12ff7891..5b4fb9be50529 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -121,17 +121,21 @@ jobs: with: ref: ${{ inputs.ref_name }} - - name: Install Homebrew - run: | - sudo /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" + # TODO: Install chrome + # Latest error: sudo: a terminal is required to read the password; either use the -S option to read from standard input or configure an askpass helper + # sudo: a password is required + # Error: Process completed with exit code 1. + # - name: Install Homebrew + # run: | + # sudo /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" - - name: Verify Installation - run: | - brew --version + # - name: Verify Installation + # run: | + # brew --version - - name: Install chrome - run: | - brew install --cask google-chrome + # - name: Install chrome + # run: | + # brew install --cask google-chrome - name: Apply option overrides from matrix for this job for non-release builds if: ${{ github.event_name != 'schedule' && github.event_name != 'workflow_dispatch' && matrix.overrides != NaN }} @@ -427,20 +431,27 @@ jobs: with: ref: ${{ inputs.ref_name }} - # - name: Install chrome - # run: | - # apt-get update - # apt-get install -y wget gnupg - # wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo apt-key add - - # sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" > /etc/apt/sources.list.d/google-chrome.list' - # apt-get update - # apt-get install -y google-chrome-stable - - # - name: Install chrome - # uses: browser-actions/setup-chrome@v1 - # with: - # chrome-version: 120 - # install-dependencies: true + - name: Install Google Chrome + run: | + if [[ "${{ matrix.image }}" == "fedora39" ]]; then + sudo dnf install fedora-workstation-repositories -y + sudo dnf config-manager --set-enabled google-chrome + sudo dnf install google-chrome-stable -y + elif [[ "${{ matrix.image }}" == "alma8" ]] || [[ "${{ matrix.image }}" == "alma9" ]]; then + sudo dnf install -y wget + wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + sudo dnf install -y ./google-chrome-stable_current_x86_64.rpm + elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then + sudo apt update + sudo apt install -y wget + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + sudo apt install -y ./google-chrome-stable_current_amd64.deb + elif [[ "${{ matrix.image }}" == "debian125" ]]; then + sudo apt update + sudo apt install -y wget + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + sudo apt install -y ./google-chrome-stable_current_amd64.deb + fi - name: Dump GitHub context env: From 275529b9db4b1a09af8b6de0abcb7b9867f50cd4 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Tue, 3 Sep 2024 10:51:47 +0200 Subject: [PATCH 11/18] Fedora 39 chrome installation --- .github/workflows/root-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 5b4fb9be50529..f584768ade158 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -434,6 +434,7 @@ jobs: - name: Install Google Chrome run: | if [[ "${{ matrix.image }}" == "fedora39" ]]; then + sudo dnf install -y dnf-plugins-core sudo dnf install fedora-workstation-repositories -y sudo dnf config-manager --set-enabled google-chrome sudo dnf install google-chrome-stable -y From 823228b15067ea5e5de6cbf8b1727a7a2bf55284 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Tue, 3 Sep 2024 11:39:02 +0200 Subject: [PATCH 12/18] Remove sudo and test new svg only on linux --- .github/workflows/root-ci.yml | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index f584768ade158..24bd4b7531364 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -434,24 +434,24 @@ jobs: - name: Install Google Chrome run: | if [[ "${{ matrix.image }}" == "fedora39" ]]; then - sudo dnf install -y dnf-plugins-core - sudo dnf install fedora-workstation-repositories -y - sudo dnf config-manager --set-enabled google-chrome - sudo dnf install google-chrome-stable -y - elif [[ "${{ matrix.image }}" == "alma8" ]] || [[ "${{ matrix.image }}" == "alma9" ]]; then - sudo dnf install -y wget + dnf install -y dnf-plugins-core + dnf install fedora-workstation-repositories -y + dnf config-manager --set-enabled google-chrome + dnf install google-chrome-stable -y + elif [[ "${{ matrix.image }}" == "alma8" ]] || [[ "${{ matrix.image }}" == "alma9" ]] || [[ "${{ matrix.image }}" == "alma9-clang" ]]; then + dnf install -y wget wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm - sudo dnf install -y ./google-chrome-stable_current_x86_64.rpm + dnf install -y ./google-chrome-stable_current_x86_64.rpm elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then - sudo apt update - sudo apt install -y wget + apt update + apt install -y wget wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - sudo apt install -y ./google-chrome-stable_current_amd64.deb + apt install -y ./google-chrome-stable_current_amd64.deb elif [[ "${{ matrix.image }}" == "debian125" ]]; then - sudo apt update - sudo apt install -y wget + apt update + apt install -y wget wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - sudo apt install -y ./google-chrome-stable_current_amd64.deb + apt install -y ./google-chrome-stable_current_amd64.deb fi - name: Dump GitHub context From 8740d90c5998b5376f9e20f27bc57edc541689f6 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Tue, 3 Sep 2024 13:12:55 +0200 Subject: [PATCH 13/18] chrome installation. enforcing bash --- .github/workflows/root-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 24bd4b7531364..c78d3c6cf2260 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -432,6 +432,7 @@ jobs: ref: ${{ inputs.ref_name }} - name: Install Google Chrome + shell: bash run: | if [[ "${{ matrix.image }}" == "fedora39" ]]; then dnf install -y dnf-plugins-core From 1ce631e5290583c85445e6d7c0d6e6b43606bf17 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 12 Sep 2024 08:45:42 +0200 Subject: [PATCH 14/18] Reverted changes in build.py --- .github/workflows/root-ci-config/build_root.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/root-ci-config/build_root.py b/.github/workflows/root-ci-config/build_root.py index 96b0ef269ea25..4559622b7528c 100755 --- a/.github/workflows/root-ci-config/build_root.py +++ b/.github/workflows/root-ci-config/build_root.py @@ -434,10 +434,7 @@ def rebase(directory: str, repository:str, base_ref: str, head_ref: str, head_sh git config user.name 'ROOT Continous Integration' git fetch {repository} {branch} - git checkout {head_ref} -f - git status - git diff - git reset --hard + git checkout {head_ref} git rebase {base_ref} """) From ed25209ee6eb067dc61cf3c2e7695a575d1fb692 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 12 Sep 2024 13:29:42 +0200 Subject: [PATCH 15/18] Chromium instead of google chrome installation --- .github/workflows/root-ci.yml | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index c78d3c6cf2260..bf8eaf41e1e4a 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -431,28 +431,20 @@ jobs: with: ref: ${{ inputs.ref_name }} - - name: Install Google Chrome + - name: Install Chromium shell: bash run: | if [[ "${{ matrix.image }}" == "fedora39" ]]; then - dnf install -y dnf-plugins-core - dnf install fedora-workstation-repositories -y - dnf config-manager --set-enabled google-chrome - dnf install google-chrome-stable -y + dnf install -y chromium elif [[ "${{ matrix.image }}" == "alma8" ]] || [[ "${{ matrix.image }}" == "alma9" ]] || [[ "${{ matrix.image }}" == "alma9-clang" ]]; then - dnf install -y wget - wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm - dnf install -y ./google-chrome-stable_current_x86_64.rpm + dnf install -y epel-release + dnf install -y chromium elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then apt update - apt install -y wget - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - apt install -y ./google-chrome-stable_current_amd64.deb + apt install -y chromium-browser elif [[ "${{ matrix.image }}" == "debian125" ]]; then apt update - apt install -y wget - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb - apt install -y ./google-chrome-stable_current_amd64.deb + apt install -y chromium fi - name: Dump GitHub context From 908aee3277a7c8c30cc2afce916ca6dc619c0aca Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 12 Sep 2024 16:18:27 +0200 Subject: [PATCH 16/18] Changed chromium installation for ubuntu --- .github/workflows/root-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index bf8eaf41e1e4a..449976136bc63 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -441,7 +441,7 @@ jobs: dnf install -y chromium elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then apt update - apt install -y chromium-browser + snap install chromium elif [[ "${{ matrix.image }}" == "debian125" ]]; then apt update apt install -y chromium From fd86e6933dda2687a386818199d008de1554f2d7 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 12 Sep 2024 16:33:06 +0200 Subject: [PATCH 17/18] Adding snap to ubuntu chromium installation --- .github/workflows/root-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index 449976136bc63..cb3974fbe1be7 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -441,6 +441,8 @@ jobs: dnf install -y chromium elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then apt update + apt install -y snapd # Install snapd first + systemctl start snapd # Ensure snapd is running snap install chromium elif [[ "${{ matrix.image }}" == "debian125" ]]; then apt update From abbb7b0ad9a1f12242a6b30f6d9bb80cbe564e22 Mon Sep 17 00:00:00 2001 From: Adrian Duesselberg Date: Thu, 12 Sep 2024 17:01:34 +0200 Subject: [PATCH 18/18] changing back to google chrome --- .github/workflows/root-ci.yml | 40 ++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 8 deletions(-) diff --git a/.github/workflows/root-ci.yml b/.github/workflows/root-ci.yml index cb3974fbe1be7..0431e2f4318e2 100644 --- a/.github/workflows/root-ci.yml +++ b/.github/workflows/root-ci.yml @@ -431,22 +431,46 @@ jobs: with: ref: ${{ inputs.ref_name }} - - name: Install Chromium + # - name: Install Chromium + # shell: bash + # run: | + # if [[ "${{ matrix.image }}" == "fedora39" ]]; then + # dnf install -y chromium + # elif [[ "${{ matrix.image }}" == "alma8" ]] || [[ "${{ matrix.image }}" == "alma9" ]] || [[ "${{ matrix.image }}" == "alma9-clang" ]]; then + # dnf install -y epel-release + # dnf install -y chromium + # elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then + # apt update + # apt install -y snapd # Install snapd first + # systemctl start snapd # Ensure snapd is running + # snap install chromium + # elif [[ "${{ matrix.image }}" == "debian125" ]]; then + # apt update + # apt install -y chromium + # fi + + - name: Install Google Chrome shell: bash run: | if [[ "${{ matrix.image }}" == "fedora39" ]]; then - dnf install -y chromium + dnf install -y dnf-plugins-core + dnf install fedora-workstation-repositories -y + dnf config-manager --set-enabled google-chrome + dnf install google-chrome-stable -y elif [[ "${{ matrix.image }}" == "alma8" ]] || [[ "${{ matrix.image }}" == "alma9" ]] || [[ "${{ matrix.image }}" == "alma9-clang" ]]; then - dnf install -y epel-release - dnf install -y chromium + dnf install -y wget + wget https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm + dnf install -y ./google-chrome-stable_current_x86_64.rpm elif [[ "${{ matrix.image }}" == "ubuntu20" ]] || [[ "${{ matrix.image }}" == "ubuntu22" ]] || [[ "${{ matrix.image }}" == "ubuntu2404" ]]; then apt update - apt install -y snapd # Install snapd first - systemctl start snapd # Ensure snapd is running - snap install chromium + apt install -y wget + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + apt install -y ./google-chrome-stable_current_amd64.deb elif [[ "${{ matrix.image }}" == "debian125" ]]; then apt update - apt install -y chromium + apt install -y wget + wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + apt install -y ./google-chrome-stable_current_amd64.deb fi - name: Dump GitHub context