Skip to content

Commit

Permalink
Merge pull request moby#5018 from crazy-max/ci-ubuntu2404
Browse files Browse the repository at this point in the history
ci: switch to ubuntu-24.04 runner
  • Loading branch information
tonistiigi authored Jun 11, 2024
2 parents 4d9a4e5 + 7c5eed6 commit 3839237
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
pkgs: ${{ steps.set.outputs.pkgs }}
kinds: ${{ steps.set.outputs.kinds }}
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
*.cache-to=type=gha,scope=${{ inputs.cache_scope }}
run:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- prepare
env:
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/buildkit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
tag: ${{ steps.prep.outputs.tag }}
push: ${{ steps.prep.outputs.push }}
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
echo "platforms=$platforms" >>${GITHUB_OUTPUT}
binaries:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- prepare
strategy:
Expand Down Expand Up @@ -143,7 +143,7 @@ jobs:
typ: integration
image:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- prepare
- test
Expand Down Expand Up @@ -188,7 +188,7 @@ jobs:
CACHE_TO: type=gha,scope=image${{ matrix.target-stage }}

release:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- prepare
- test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/buildx-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:

jobs:
create:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dockerd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
-
name: Prepare
Expand Down Expand Up @@ -71,7 +71,7 @@ jobs:
retention-days: 1

test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- prepare
strategy:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
codecov_flags: dockerfile-frontend

prepare:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: github.event_name != 'schedule'
outputs:
typ: ${{ steps.prep.outputs.typ }}
Expand Down Expand Up @@ -75,7 +75,7 @@ jobs:
fi
image:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- test
- prepare
Expand Down Expand Up @@ -125,7 +125,7 @@ jobs:
CACHE_TO: type=gha,scope=${{ env.CACHE_SCOPE }}

release:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
if: startsWith(github.ref, 'refs/tags/dockerfile')
needs:
- prepare
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-os.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:

jobs:
build:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
strategy:
fail-fast: false
matrix:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:

jobs:
prepare:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
outputs:
targets: ${{ steps.targets.outputs.matrix }}
steps:
Expand All @@ -35,7 +35,7 @@ jobs:
echo "matrix=$(docker buildx bake validate --print | jq -cr '.target | keys')" >> $GITHUB_OUTPUT
validate:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs:
- prepare
strategy:
Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
targets: ${{ matrix.target }}

archutil-arm64:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
# TODO: enable when binutils-loongarch64-linux-gnu pkg is available for aarch64 arch
# https://github.com/moby/buildkit/pull/4392#issuecomment-1938223235
if: false
Expand Down

0 comments on commit 3839237

Please sign in to comment.