diff --git a/.cirrus.yml b/.cirrus.yml index 8328b96..ad555cc 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -301,7 +301,7 @@ task: CI_CHANNEL: "Stable" task: - name: "Chromium $CI_DISTRO" + name: "$CI_PACKAGE_NAME $CI_DISTRO" matrix: - container: image: fedora:latest @@ -309,10 +309,18 @@ task: memory: 1G package_install_script: - dnf install -y chromium + - dnf install -y https://dl.google.com/linux/direct/google-chrome-stable_current_x86_64.rpm env: CI_DISTRO: fedora - CI_MAIN_MODULE: /usr/lib64/pkcs11/p11-kit-trust.so - CI_BAK_MODULE: /usr/lib64/pkcs11/p11-kit-trust.orig.so + matrix: + - env: + CI_PACKAGE_NAME: "chromium-browser" + CI_MAIN_MODULE: /usr/lib64/pkcs11/p11-kit-trust.so + CI_BAK_MODULE: /usr/lib64/pkcs11/p11-kit-trust.orig.so + - env: + CI_PACKAGE_NAME: "google-chrome" + CI_MAIN_MODULE: /usr/lib64/pkcs11/p11-kit-trust.so + CI_BAK_MODULE: /usr/lib64/pkcs11/p11-kit-trust.orig.so - container: image: debian:latest cpu: 1 @@ -321,10 +329,20 @@ task: - apt-get update - apt-get install -y curl chromium - ln -s -T /usr/bin/chromium /usr/bin/chromium-browser + - apt-get install -y curl wget gnupg2 + - wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb + - apt install -y ./google-chrome-stable_current_amd64.deb env: CI_DISTRO: debian - CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so - CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so + matrix: + - env: + CI_PACKAGE_NAME: "chromium-browser" + CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so + CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so + - env: + CI_PACKAGE_NAME: "google-chrome" + CI_MAIN_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.so + CI_BAK_MODULE: /usr/lib/x86_64-linux-gnu/nss/libnssckbi.orig.so install_script: - curl -o pkcs11mod.tar.gz https://api.cirrus-ci.com/v1/artifact/build/$CIRRUS_BUILD_ID/Compile%20Go%20latest%20linux%20amd64/binaries/dist/pkcs11mod.tar.gz - tar -xaf ./pkcs11mod.tar.gz diff --git a/testdata/try-chromium-connect.bash b/testdata/try-chromium-connect.bash index c32cb77..fc2a55a 100755 --- a/testdata/try-chromium-connect.bash +++ b/testdata/try-chromium-connect.bash @@ -22,7 +22,7 @@ rm -f screenshot.png # Disable sandbox because Chromium doesn't support running the sandbox as root, # and the Cirrus container runs as root. See # https://github.com/Zenika/alpine-chrome . -chromium-browser --no-sandbox --headless --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage --screenshot=./screenshot.png "https://$SERVER_HOST" 2>&1 | tee log.txt +"$CI_PACKAGE_NAME" --no-sandbox --headless --disable-gpu --disable-software-rasterizer --disable-dev-shm-usage --screenshot=./screenshot.png "https://$SERVER_HOST" 2>&1 | tee log.txt TEXTOUT=$(cat log.txt) if echo "$TEXTOUT" | grep -q "SSL error"