From d856d800ad44ff1574fb731d82cdae2240ea4ccc Mon Sep 17 00:00:00 2001
From: jj <log@riseup.net>
Date: Fri, 5 Jun 2026 15:30:55 +0200
Subject: [PATCH] ci: complete cirrus port to github actions (#1867)

---
 .cirrus.yml                  | 66 ------------------------------------
 .github/workflows/ci.yml     | 18 ++++++++--
 .github/workflows/cirrus.yml | 13 -------
 3 files changed, 16 insertions(+), 81 deletions(-)
 delete mode 100644 .cirrus.yml
 delete mode 100644 .github/workflows/cirrus.yml

diff --git a/.cirrus.yml b/.cirrus.yml
deleted file mode 100644
index 204f7179..00000000
--- a/.cirrus.yml
+++ /dev/null
@@ -1,66 +0,0 @@
-env:
-    CIRRUS_CLONE_DEPTH: 1
-
-container:
-    dockerfile: .cirrus_Dockerfile
-    cpu: 8
-    memory: 32G
-    use_in_memory_disk: true
-
-code_check_task:
-    pip_cache:
-        folder: /usr/local/lib/python3.10/site-packages
-        fingerprint_script: cat .cirrus_requirements.txt
-        populate_script: python3 -m ensurepip && pip install -r .cirrus_requirements.txt
-    utils_script:
-        - python3 -m yapf --style '.style.yapf' -e '*/third_party/*' -rpd utils
-        - ./devutils/run_utils_pylint.py --hide-fixme
-        - ./devutils/run_utils_tests.sh
-    devutils_script:
-        - python3 -m yapf --style '.style.yapf' -e '*/third_party/*' -rpd devutils
-        - ./devutils/run_devutils_pylint.py --hide-fixme
-        - ./devutils/run_devutils_tests.sh
-
-validate_config_task:
-    validate_config_script: ./devutils/validate_config.py
-
-validate_with_source_task:
-    pip_cache:
-        folder: /usr/local/lib/python3.10/site-packages
-        fingerprint_script: cat .cirrus_requirements.txt
-        populate_script: python3 -m ensurepip && pip install -r .cirrus_requirements.txt
-    chromium_download_script: |
-        # These directories will not exist when this is called, unless cache retrieval
-        # fails and leaves partially-complete files around.
-        rm -rf chromium_src
-        rm -rf chromium_download_cache
-        mkdir chromium_download_cache
-        # Attempt to download tarball
-        ./utils/downloads.py retrieve -i deps.ini -c chromium_download_cache &
-        if ! ./utils/downloads.py retrieve -i downloads.ini -c chromium_download_cache ; then
-          # If tarball is not available, attempt a clone
-          ./utils/clone.py -o chromium_src
-          rm -rf chromium_src/uc_staging
-          find chromium_src -type d -name '.git' -exec rm -rf "{}" \; -prune
-          tar cf chromium_download_cache/chromium-$(cat chromium_version.txt)-lite.tar.xz \
-            --transform s/chromium_src/chromium-$(cat chromium_version.txt)/ chromium_src
-        fi
-        wait
-    unpack_source_script: |
-        if [ ! -d chromium_src ]; then
-            ./utils/downloads.py unpack -i downloads.ini -c chromium_download_cache chromium_src
-        fi
-        ./utils/downloads.py unpack -i deps.ini -c chromium_download_cache chromium_src
-    validate_patches_script:
-        - ./devutils/validate_patches.py -l chromium_src -v
-    validate_lists_script: |
-        set -e
-        ./devutils/update_lists.py \
-            --tree chromium_src \
-            --pruning pruning.list.gen \
-            --domain-substitution domain_substitution.list.gen \
-            --no-error-unused
-        diff pruning.list pruning.list.gen
-        diff domain_substitution.list domain_substitution.list.gen
-
-# vim: set expandtab shiftwidth=4 softtabstop=4:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2a588fb5..311a5ef4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,13 +71,16 @@ jobs:
         uses: actions/cache@v5
         with:
           path: chromium_download_cache
-          key: ${{ runner.os }}-chromium-download-cache-${{ hashFiles('chromium_version.txt', 'downloads.ini') }}
+          key: ${{ runner.os }}-chromium-download-cache-${{ hashFiles('chromium_version.txt', 'downloads.ini', 'deps.ini') }}
 
       - name: Retrieve Chromium source archive
         run: |
           rm -rf chromium_src
           mkdir -p chromium_download_cache
 
+          ./utils/downloads.py retrieve -i deps.ini -c chromium_download_cache &
+          DEPS_PID=$!
+
           if ! ./utils/downloads.py retrieve -i downloads.ini -c chromium_download_cache; then
             ./utils/clone.py -o chromium_src
             rm -rf chromium_src/uc_staging
@@ -86,14 +89,25 @@ jobs:
               --transform "s/chromium_src/chromium-$(cat chromium_version.txt)/" chromium_src
           fi
 
+          wait "$DEPS_PID"
+
       - name: Unpack Chromium source archive
         run: |
           if [ ! -d chromium_src ]; then
             ./utils/downloads.py unpack -i downloads.ini -c chromium_download_cache chromium_src
           fi
+          ./utils/downloads.py unpack -i deps.ini -c chromium_download_cache chromium_src
 
       - name: Validate patches
         run: ./devutils/validate_patches.py -l chromium_src -v
 
       - name: Validate source file lists
-        run: ./devutils/check_files_exist.py chromium_src pruning.list domain_substitution.list
+        run: |
+          set -e
+          ./devutils/update_lists.py \
+            --tree chromium_src \
+            --pruning pruning.list.gen \
+            --domain-substitution domain_substitution.list.gen \
+            --no-error-unused
+          diff -u pruning.list pruning.list.gen
+          diff -u domain_substitution.list domain_substitution.list.gen
diff --git a/.github/workflows/cirrus.yml b/.github/workflows/cirrus.yml
deleted file mode 100644
index 4156de43..00000000
--- a/.github/workflows/cirrus.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-name: cirrus
-
-on: [push, pull_request]
-
-permissions:
-  contents: read
-
-jobs:
-  cirrus:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: cirruslabs/cirrus-action@ac5191d18a9bff05ff1a38f280f2b6d768e32153