Skip to content

Commit e36ccbb

Browse files
committed
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 <rmeggins@redhat.com>
1 parent 4cf23a0 commit e36ccbb

7 files changed

Lines changed: 15 additions & 15 deletions

File tree

‎.github/workflows/actions.lock‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ workflows:
2626
'.github/workflows/citest.yml': []
2727
'.github/workflows/codeql.yml':
2828
- 'actions/checkout@v7.0.1'
29-
- 'github/codeql-action@v4.39.1'
29+
- 'github/codeql-action@v4.39.3'
3030
- 'linux-system-roles/.github@main'
3131
'.github/workflows/codespell.yml':
3232
- 'actions/checkout@v7.0.1'
@@ -103,14 +103,14 @@ dependencies:
103103
commit: 'sha1-e3258cca84ce02b0bb36a3d41f2c18f719a0cc1a'
104104
owner_id: 39140587
105105
repo_id: 263411323
106-
'github/codeql-action@v4.39.1':
107-
ref: 'v4.39.1'
108-
commit: 'sha1-9b3254085494b55a0f7c4c2b3d2d52cc712ce370'
106+
'github/codeql-action@v4.39.3':
107+
ref: 'v4.39.3'
108+
commit: 'sha1-33d7b85da1a04171e211befe2c739303b9a4c066'
109109
owner_id: 9919
110110
repo_id: 259445878
111111
'linux-system-roles/.github@main':
112112
ref: 'main'
113-
commit: 'sha1-54e8132c2d5c8ea4edf115040dc11cf0d5b2dfff'
113+
commit: 'sha1-6a871b700c52584c272c33029b1bdd62a0e474cb'
114114
owner_id: 28014670
115115
repo_id: 320092621
116116
'sclorg/testing-farm-as-github-action@v4.3.1':

‎.github/workflows/ansible-lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Install tox, tox-lsr
6969
run: |
7070
set -euxo pipefail
71-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948"
71+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18"
7272
7373
- name: Set up Python
7474
uses: actions/setup-python@v7.1.0

‎.github/workflows/ansible-managed-var-comment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
- name: Install tox, tox-lsr
5858
run: |
5959
set -euxo pipefail
60-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948"
60+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18"
6161
6262
- name: Run ansible-plugin-scan
6363
run: |

‎.github/workflows/ansible-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
fail-fast: false # get all results, not just the first failure
2424
matrix:
2525
versions:
26-
- { ansible: "2-14", python: "3.9", runner_os: "ubuntu-latest" }
26+
- { ansible: "2-14", python: "3.9", runner_os: "ubuntu-24.04" }
2727
- { ansible: "2-16", python: "3.11", runner_os: "ubuntu-latest" }
2828
- { ansible: "2-17", python: "3.12", runner_os: "ubuntu-latest" }
2929
- { ansible: "2-20", python: "3.13", runner_os: "ubuntu-latest" }
@@ -71,7 +71,7 @@ jobs:
7171
- name: Install tox, tox-lsr
7272
run: |
7373
set -euxo pipefail
74-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948"
74+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18"
7575
7676
- name: Set up Python
7777
uses: actions/setup-python@v7.1.0

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,16 +67,16 @@ jobs:
6767
ref: ${{ steps.head_sha_context.outputs.head_sha || github.sha }}
6868

6969
- name: Initialize CodeQL
70-
uses: github/codeql-action/init@v4.39.1
70+
uses: github/codeql-action/init@v4.39.3
7171
with:
7272
languages: ${{ matrix.language }}
7373
queries: +security-and-quality
7474

7575
- name: Autobuild
76-
uses: github/codeql-action/autobuild@v4.39.1
76+
uses: github/codeql-action/autobuild@v4.39.3
7777

7878
- name: Perform CodeQL Analysis
79-
uses: github/codeql-action/analyze@v4.39.1
79+
uses: github/codeql-action/analyze@v4.39.3
8080
with:
8181
category: "/language:${{ matrix.language }}"
8282

‎.github/workflows/python-unit-test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- ver: "2.7"
2323
os: ubuntu-22.04
2424
- ver: "3.9"
25-
os: ubuntu-latest
25+
os: ubuntu-24.04
2626
- ver: "3.10"
2727
os: ubuntu-latest
2828
- ver: "3.11"
@@ -94,7 +94,7 @@ jobs:
9494
tox=tox
9595
virtualenv=virtualenv
9696
fi
97-
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948"
97+
pip install "$tox" "$virtualenv" "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18"
9898
# If you have additional OS dependency packages e.g. libcairo2-dev
9999
# then put them in .github/config/ubuntu-requirements.txt, one
100100
# package per line.

‎.github/workflows/qemu-kvm-integration-tests.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141
python3 -m pip install --upgrade pip
142142
sudo apt update
143143
sudo apt install -y --no-install-recommends git ansible-core genisoimage qemu-system-x86 qemu-utils
144-
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b8adb1a54303ce668b39fedf86e89cd0895df948"
144+
pip3 install "git+https://github.com/linux-system-roles/tox-lsr@b30596c6fd1863b2eed20206ef32d13eac478e18"
145145
146146
- name: Check for podman version 5 or higher
147147
id: check_podman_version

0 commit comments

Comments
 (0)