From a85aa0cb61dc76337c7a9f8f95958f9337f1ae80 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Wed, 11 Nov 2026 11:32:14 -0700 Subject: [PATCH] ci: use ubuntu 24.04 for test envs that use py39 github actions recently changed `ubuntu-latest` to use `26.04` instead of `24.04`. We need to use `ubuntu-24.04` for those test environments that need python 3.9 Also a minor update to tox-lsr and codeql Signed-off-by: Rich Megginson --- .github/workflows/actions.lock | 10 +++++----- .github/workflows/ansible-lint.yml | 2 +- .github/workflows/ansible-managed-var-comment.yml | 2 +- .github/workflows/ansible-test.yml | 4 ++-- .github/workflows/codeql.yml | 6 +++--- .github/workflows/python-unit-test.yml | 4 ++-- .github/workflows/qemu-kvm-integration-tests.yml | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/workflows/actions.lock b/.github/workflows/actions.lock index 59e39b99..2063b40e 100644 --- a/.github/workflows/actions.lock +++ b/.github/workflows/actions.lock @@ -26,7 +26,7 @@ workflows: '.github/workflows/citest.yml': [] '.github/workflows/codeql.yml': - 'actions/checkout@v7.0.1' - - 'github/codeql-action@v4.39.1' + - 'github/codeql-action@v4.39.3' - 'linux-system-roles/.github@main' '.github/workflows/codespell.yml': - 'actions/checkout@v7.0.1' @@ -103,14 +103,14 @@ dependencies: commit: 'sha1-e3258cca84ce02b0bb36a3d41f2c18f719a0cc1a' owner_id: 39140587 repo_id: 263411323 - 'github/codeql-action@v4.39.1': - ref: 'v4.39.1' - commit: 'sha1-9b3254085494b55a0f7c4c2b3d2d52cc712ce370' + 'github/codeql-action@v4.39.3': + ref: 'v4.39.3' + commit: 'sha1-33d7b85da1a04171e211befe2c739303b9a4c066' owner_id: 9919 repo_id: 259445878 'linux-system-roles/.github@main': ref: 'main' - commit: 'sha1-54e8132c2d5c8ea4edf115040dc11cf0d5b2dfff' + commit: 'sha1-6a871b700c52584c272c33029b1bdd62a0e474cb' owner_id: 28014670 repo_id: 320092621 'sclorg/testing-farm-as-github-action@v4.3.1': diff --git a/.github/workflows/ansible-lint.yml b/.github/workflows/ansible-lint.yml index 0202b8f2..dd6056e5 100644 --- a/.github/workflows/ansible-lint.yml +++ b/.github/workflows/ansible-lint.yml @@ -68,7 +68,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18" - name: Set up Python uses: actions/setup-python@v7.1.0 diff --git a/.github/workflows/ansible-managed-var-comment.yml b/.github/workflows/ansible-managed-var-comment.yml index e543dadb..dea01f68 100644 --- a/.github/workflows/ansible-managed-var-comment.yml +++ b/.github/workflows/ansible-managed-var-comment.yml @@ -57,7 +57,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18" - name: Run ansible-plugin-scan run: | diff --git a/.github/workflows/ansible-test.yml b/.github/workflows/ansible-test.yml index 16e5dc53..47a63073 100644 --- a/.github/workflows/ansible-test.yml +++ b/.github/workflows/ansible-test.yml @@ -23,7 +23,7 @@ jobs: fail-fast: false # get all results, not just the first failure matrix: versions: - - { ansible: "2-14", python: "3.9", runner_os: "ubuntu-latest" } + - { ansible: "2-14", python: "3.9", runner_os: "ubuntu-24.04" } - { ansible: "2-16", python: "3.11", runner_os: "ubuntu-latest" } - { ansible: "2-17", python: "3.12", runner_os: "ubuntu-latest" } - { ansible: "2-20", python: "3.13", runner_os: "ubuntu-latest" } @@ -71,7 +71,7 @@ jobs: - name: Install tox, tox-lsr run: | set -euxo pipefail - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18" - name: Set up Python uses: actions/setup-python@v7.1.0 diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index d41a57b5..306d9831 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -67,16 +67,16 @@ jobs: ref: ${{ steps.head_sha_context.outputs.head_sha || github.sha }} - name: Initialize CodeQL - uses: github/codeql-action/init@v4.39.1 + uses: github/codeql-action/init@v4.39.3 with: languages: ${{ matrix.language }} queries: +security-and-quality - name: Autobuild - uses: github/codeql-action/autobuild@v4.39.1 + uses: github/codeql-action/autobuild@v4.39.3 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v4.39.1 + uses: github/codeql-action/analyze@v4.39.3 with: category: "/language:${{ matrix.language }}" diff --git a/.github/workflows/python-unit-test.yml b/.github/workflows/python-unit-test.yml index 7dbd88a5..d192f58c 100644 --- a/.github/workflows/python-unit-test.yml +++ b/.github/workflows/python-unit-test.yml @@ -22,7 +22,7 @@ jobs: - ver: "2.7" os: ubuntu-22.04 - ver: "3.9" - os: ubuntu-latest + os: ubuntu-24.04 - ver: "3.10" os: ubuntu-latest - ver: "3.11" @@ -94,7 +94,7 @@ jobs: tox=tox virtualenv=virtualenv fi - pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948" + pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18" # If you have additional OS dependency packages e.g. libcairo2-dev # then put them in .github/config/ubuntu-requirements.txt, one # package per line. diff --git a/.github/workflows/qemu-kvm-integration-tests.yml b/.github/workflows/qemu-kvm-integration-tests.yml index 6b18a30d..18aa3259 100644 --- a/.github/workflows/qemu-kvm-integration-tests.yml +++ b/.github/workflows/qemu-kvm-integration-tests.yml @@ -141,7 +141,7 @@ jobs: python3 -m pip install --upgrade pip sudo apt update sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86 qemu-utils - pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948" + pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18" - name: Check for podman version 5 or higher id: check_podman_version