CI - update all GitHub action runners to ubuntu-22.04 (#7064)

* CI - update all GitHub action runners to ubuntu-22.04 Address deprecation warning for the ubuntu-20.04 GHA runner image. Use more conservative ubuntu-22.04, because the ubuntu-latest image gives SSL errors in pip execution. * REVERT ME - temporarily activate ci-daily in pull requests * CI - install the missing Ubuntu package libffi7 * Address complaint from shellcheck-0.8.0 * Revert "REVERT ME - temporarily activate ci-daily in pull requests" This reverts commit f9f653e. * Use separate GitHub actions cache for the pytest-numpy-2 job Do not pre-install packages from a standard pytest job.
quantumlib · Feb 13, 2025 · 847f918 · 847f918
1 parent d5c2b41
commit 847f918
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 30 deletions.
diff --git a/.github/workflows/ci-daily.yml b/.github/workflows/ci-daily.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5
@@ -26,6 +26,10 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
+      - name: Install system requirements
+        run: |
+          sudo apt-get update
+          sudo apt-get install libffi7
       - name: Install requirements
         run: |
           pip install cirq~=1.0.dev &&

diff --git a/.github/workflows/ci-weekly.yml b/.github/workflows/ci-weekly.yml
@@ -18,7 +18,7 @@ jobs:
       matrix:
         # partitions should be named partition-0 to partition-(NOTEBOOK_PARTITIONS-1)
         partition: [partition-0, partition-1, partition-2, partition-3]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-python@v5

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ concurrency:
 jobs:
   quick_test:
     name: Misc check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -31,7 +31,7 @@ jobs:
         run: check/misc
   packaging_test:
     name: Packaging test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -46,7 +46,7 @@ jobs:
         run: ./dev_tools/packaging/packaging_test.sh
   format:
     name: Format check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -63,7 +63,7 @@ jobs:
         run: check/format-incremental
   mypy:
     name: Type check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -78,7 +78,7 @@ jobs:
         run: check/mypy
   changed_files:
     name: Changed files test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -95,7 +95,7 @@ jobs:
         run: check/pytest-changed-files -n auto
   lint:
     name: Lint check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -112,7 +112,7 @@ jobs:
         run: check/pylint -v
   doc_test:
     name: Doc test
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -127,7 +127,7 @@ jobs:
         run: check/doctest -q
   nbformat:
     name: Notebook formatting
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -142,7 +142,7 @@ jobs:
         run: check/nbformat
   shellcheck:
     name: Shell check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -152,7 +152,7 @@ jobs:
         run: check/shellcheck
   isolated-modules:
     name: Isolated pytest Ubuntu
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -170,7 +170,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -184,6 +184,10 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
+      - name: Install system packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install libffi7
       - name: Install requirements
         run: |
           pip install wheel
@@ -200,7 +204,7 @@ jobs:
     strategy:
       matrix:
         python-version: ['3.10', '3.11', '3.12', '3.13']
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -213,7 +217,11 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ${{ env.pythonLocation }}
-          key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
+          key: numpy2-${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
+      - name: Install system packages
+        run: |
+          sudo apt-get update
+          sudo apt-get install libffi7
       - name: Install requirements
         run: |
           pip install wheel
@@ -222,7 +230,7 @@ jobs:
         run: check/pytest -n auto --warn-numpy-data-promotion --durations=20 --ignore=cirq-rigetti
   pip-compile:
     name: Check consistency of requirements
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -238,7 +246,7 @@ jobs:
           pip-compile --resolver=backtracking dev_tools/requirements/deps/cirq-all.txt -o-
   build_protos:
     name: Build protos
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -256,7 +264,7 @@ jobs:
         run: check/protos-up-to-date
   coverage:
     name: Coverage check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -272,6 +280,10 @@ jobs:
         with:
           path: ${{ env.pythonLocation }}
           key: ${{ env.pythonLocation }}-${{ hashFiles('**/requirements.txt', 'dev_tools/requirements/**/*.txt') }}
+      - name: Install system requirements
+        run: |
+          sudo apt-get update
+          sudo apt-get install libffi7
       - name: Install requirements
         run: |
           pip install wheel
@@ -347,7 +359,7 @@ jobs:
       matrix:
         # partitions should be named partition-0 to partition-(NOTEBOOK_PARTITIONS-1)
         partition: [partition-0, partition-1, partition-2, partition-3]
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -370,7 +382,7 @@ jobs:
           path: out
   notebooks-branch:
     name: Notebook Tests against PR
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -391,7 +403,7 @@ jobs:
           path: out
   ts-build:
     name: Bundle file consistency
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -405,7 +417,7 @@ jobs:
         run: check/ts-build-current
   ts-lint:
     name: Typescript lint check
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -419,7 +431,7 @@ jobs:
         run: check/ts-lint
   ts-test:
     name: Typescript tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4
@@ -435,7 +447,7 @@ jobs:
         run: check/ts-test-e2e
   ts-coverage:
     name: Typescript tests coverage
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out source repository
         uses: actions/checkout@v4

diff --git a/.github/workflows/pytest-debug.yaml b/.github/workflows/pytest-debug.yaml
@@ -25,7 +25,7 @@ on:
       os:
         description: "Runner OS:"
         type: choice
-        default: ubuntu-20.04
+        default: ubuntu-22.04
         options:
           - ubuntu-22.04
           - ubuntu-20.04

diff --git a/.github/workflows/release-main.yml b/.github/workflows/release-main.yml
@@ -8,7 +8,7 @@ jobs:
   push_to_pypi:
     if: github.repository == 'quantumlib/Cirq'
     name: Push to PyPi
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     env:
       NAME: dev-release
     steps:

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -21,7 +21,7 @@ on:
 jobs:
   stale:
     name: Label and/or close stale issues and PRs
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     permissions:
       issues: write
       pull-requests: write

diff --git a/dev_tools/packaging/verify-published-package.sh b/dev_tools/packaging/verify-published-package.sh
@@ -42,12 +42,14 @@ if [ -z "${PROJECT_VERSION}" ]; then
     exit 1
 fi
 
+typeset -a PIP_FLAGS
+
 if [ "${PROD_SWITCH}" = "--test" ]; then
-    PIP_FLAGS="--index-url=https://test.pypi.org/simple/"
+    PIP_FLAGS=("--index-url=https://test.pypi.org/simple/")
     PYPI_REPO_NAME="TEST"
     PYPI_PROJECT_NAME="cirq"
 elif [ "${PROD_SWITCH}" = "--prod" ]; then
-    PIP_FLAGS=''
+    PIP_FLAGS=()
     PYPI_REPO_NAME="PROD"
     PYPI_PROJECT_NAME="cirq"
 else
@@ -76,7 +78,7 @@ echo "Working in a fresh virtualenv at ${tmp_dir}/${PYTHON_VERSION}"
 virtualenv --quiet "--python=/usr/bin/${PYTHON_VERSION}" "${tmp_dir}/${PYTHON_VERSION}"
 
 echo Installing "${PYPI_PROJECT_NAME}==${PROJECT_VERSION} from ${PYPI_REPO_NAME} pypi"
-"${tmp_dir}/${PYTHON_VERSION}/bin/pip" install --quiet ${PIP_FLAGS} "${PYPI_PROJECT_NAME}==${PROJECT_VERSION}" --extra-index-url https://pypi.python.org/simple
+"${tmp_dir}/${PYTHON_VERSION}/bin/pip" install --quiet "${PIP_FLAGS[@]}" "${PYPI_PROJECT_NAME}==${PROJECT_VERSION}" --extra-index-url https://pypi.python.org/simple
 
 # Check that code runs without dev deps.
 echo Checking that code executes