Skip to content

Commit b4c6002

Browse files
committed
ci: use ubuntu-24.04 runners
Github actions runner-images install buildah from the distro. 22.04 has an ancient version and is known not to work. Bump to the latest 24.04 runners and at the same time, drop the BUILDAH_RUNTIME override. Signed-off-by: Mikko Ylinen <[email protected]>
1 parent 96f2f3c commit b4c6002

File tree

9 files changed

+15
-15
lines changed

9 files changed

+15
-15
lines changed

.github/workflows/lib-build.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
image:
1111
name: Build image
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
strategy:
1414
matrix:
1515
image:

.github/workflows/lib-codeql.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
analyze:
1212
name: Analysis
13-
runs-on: 'ubuntu-22.04'
13+
runs-on: ubuntu-24.04
1414
timeout-minutes: 360
1515

1616
permissions:

.github/workflows/lib-publish.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ permissions:
1515
jobs:
1616
image:
1717
name: Build image
18-
runs-on: ubuntu-22.04
18+
runs-on: ubuntu-24.04
1919
strategy:
2020
fail-fast: false
2121
matrix:

.github/workflows/lib-scorecard.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ permissions:
99
jobs:
1010
analysis:
1111
name: Analysis
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313

1414
permissions:
1515
security-events: write

.github/workflows/lib-trivy.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
trivy-scan-deployments:
2828
name: Scan deployments
2929
if: ${{ inputs.deployments }}
30-
runs-on: ubuntu-22.04
30+
runs-on: ubuntu-24.04
3131
steps:
3232
- name: Checkout
3333
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
@@ -45,7 +45,7 @@ jobs:
4545
trivy-scan-dockerfiles:
4646
name: Scan Dockerfiles
4747
if: ${{ inputs.dockerfiles }}
48-
runs-on: ubuntu-22.04
48+
runs-on: ubuntu-24.04
4949
steps:
5050
- name: Checkout
5151
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
@@ -58,7 +58,7 @@ jobs:
5858
severity: CRITICAL,HIGH
5959

6060
trivy-scan-licenses:
61-
runs-on: ubuntu-22.04
61+
runs-on: ubuntu-24.04
6262
name: Scan licenses
6363
steps:
6464
- name: Checkout
@@ -75,7 +75,7 @@ jobs:
7575
trivy-scan-vulns:
7676
permissions:
7777
security-events: write
78-
runs-on: ubuntu-22.04
78+
runs-on: ubuntu-24.04
7979
name: Scan vulnerabilities
8080
steps:
8181
- name: Checkout

.github/workflows/lib-validate.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88
jobs:
99
docs:
1010
name: Check docs are buildable
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Install dependencies
1414
run: |
@@ -32,7 +32,7 @@ jobs:
3232
permissions:
3333
pull-requests: read # for golangci/golangci-lint-action to fetch pull requests
3434
name: lint
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
steps:
3737
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3838
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
@@ -46,7 +46,7 @@ jobs:
4646
args: -v --timeout 5m
4747
build:
4848
name: Build and check device plugins
49-
runs-on: ubuntu-22.04
49+
runs-on: ubuntu-24.04
5050
steps:
5151
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
5252
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5
@@ -63,7 +63,7 @@ jobs:
6363
# run: bash <(curl -s https://codecov.io/bash)
6464
envtest:
6565
name: Test APIs using envtest
66-
runs-on: ubuntu-22.04
66+
runs-on: ubuntu-24.04
6767
strategy:
6868
matrix:
6969
version:

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ permissions:
1010
jobs:
1111
tag_fix:
1212
name: Prepare image tag
13-
runs-on: ubuntu-22.04
13+
runs-on: ubuntu-24.04
1414
outputs:
1515
fixed_tag: ${{ steps.fix.outputs.tag }}
1616
env:

build/docker/build-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ BUILD_ARGS="${BUILD_ARGS} --build-arg FINAL_BASE=gcr.io/distroless/static"
3333
if [ -z "${BUILDER}" -o "${BUILDER}" = 'docker' -o "${BUILDER}" = 'podman' ] ; then
3434
${BUILDER} build --pull -t ${IMG}:${TAG} ${BUILD_ARGS} -f ${DOCKERFILE} .
3535
elif [ "${BUILDER}" = 'buildah' ] ; then
36-
BUILDAH_RUNTIME=runc buildah bud --pull-always -t ${IMG}:${TAG} ${BUILD_ARGS} -f ${DOCKERFILE} .
36+
buildah bud --pull-always -t ${IMG}:${TAG} ${BUILD_ARGS} -f ${DOCKERFILE} .
3737
else
3838
(>&2 echo "Unknown builder ${BUILDER}")
3939
exit 1

demo/build-image.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TAG=${TAG:-devel}
2020
if [ -z "$BUILDER" -o "$BUILDER" = 'docker' -o "$BUILDER" = 'podman' ] ; then
2121
${BUILDER} build --pull -t ${IMG}:${TAG} "$CWD/$DIR/"
2222
elif [ "$BUILDER" = 'buildah' ] ; then
23-
BUILDAH_RUNTIME=runc buildah bud --pull-always -t ${IMG}:${TAG} "$CWD/$DIR/"
23+
buildah bud --pull-always -t ${IMG}:${TAG} "$CWD/$DIR/"
2424
else
2525
(>&2 echo "Unknown builder $BUILDER")
2626
exit 1

0 commit comments

Comments
 (0)