From 25b7f469e7303b02a1849c0aba65facf49651597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Wed, 20 Nov 2024 10:02:48 +0000 Subject: [PATCH] internal/ci: update Linux to ubuntu-24.04 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GitHub made ubuntu-24.04 generally available back in September via https://github.blog/changelog/2024-09-25-actions-new-images-and-ubuntu-latest-changes/ and is rolling it out to ubuntu-latest from December 5th as announced in https://github.com/actions/runner-images/issues/10636. We are in no particular rush to update, but there's also no reason to stay behind given that our needs from the OS are rather basic. Moreover, since we pin the version, it can be easy to forget to update once ubuntu-latest does switch to 24.04 for everyone else. Signed-off-by: Daniel Martí Change-Id: I3fe0823abb3bdea57078643b3e81725bd6e83b9f Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1204343 TryBot-Result: CUEcueckoo Unity-Result: CUE porcuepine Reviewed-by: Paul Jolly --- .github/workflows/evict_caches.yaml | 2 +- .github/workflows/push_tip_to_trybot.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/tip_triggers.yaml | 2 +- .github/workflows/trybot.yaml | 22 +++++++++++----------- .github/workflows/trybot_dispatch.yaml | 2 +- internal/ci/repo/repo.cue | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/workflows/evict_caches.yaml b/.github/workflows/evict_caches.yaml index cfc0f531c38..3dea1ede56c 100644 --- a/.github/workflows/evict_caches.yaml +++ b/.github/workflows/evict_caches.yaml @@ -7,7 +7,7 @@ name: Evict caches jobs: test: if: ${{github.repository == 'cue-lang/cue'}} - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 defaults: run: shell: bash diff --git a/.github/workflows/push_tip_to_trybot.yaml b/.github/workflows/push_tip_to_trybot.yaml index 84e22fff724..b8ae35ab4e4 100644 --- a/.github/workflows/push_tip_to_trybot.yaml +++ b/.github/workflows/push_tip_to_trybot.yaml @@ -9,7 +9,7 @@ name: Push tip to trybot concurrency: push_tip_to_trybot jobs: push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Write netrc file for cueckoo Gerrithub run: |- diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 217028c75fc..18cdd894c93 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -13,7 +13,7 @@ name: Release concurrency: release jobs: goreleaser: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{github.repository == 'cue-lang/cue'}} defaults: run: diff --git a/.github/workflows/tip_triggers.yaml b/.github/workflows/tip_triggers.yaml index b607e7f951f..fdfff0f0112 100644 --- a/.github/workflows/tip_triggers.yaml +++ b/.github/workflows/tip_triggers.yaml @@ -8,7 +8,7 @@ name: Triggers on push to tip - ci/test jobs: push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{github.repository == 'cue-lang/cue'}} defaults: run: diff --git a/.github/workflows/trybot.yaml b/.github/workflows/trybot.yaml index 218aa4a45d8..f5fbafa2d26 100644 --- a/.github/workflows/trybot.yaml +++ b/.github/workflows/trybot.yaml @@ -20,7 +20,7 @@ jobs: - 1.22.x - 1.23.x runner: - - ubuntu-22.04 + - ubuntu-24.04 - macos-14 - windows-2022 runs-on: ${{ matrix.runner }} @@ -107,20 +107,20 @@ jobs: github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, ' Dispatch-Trailer: {"type":"')))) || github.ref == 'refs/heads/ci/test') run: go clean -testcache - - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Early git and code sanity checks run: go run ./internal/ci/checks - if: |- ((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, ' - Dispatch-Trailer: {"type":"')))) || !(matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + Dispatch-Trailer: {"type":"')))) || !(matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Test run: go test ./... - - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Test with -race run: go test -race ./... env: GORACE: atexit_sleep_ms=10 - - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Test on 32 bits run: go test -short ./... env: @@ -131,31 +131,31 @@ jobs: id: auth if: |- github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, ' - Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') uses: google-github-actions/auth@v2 with: credentials_json: ${{ secrets.E2E_GCLOUD_KEY }} - if: |- github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, ' - Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: gcloud setup for end-to-end tests uses: google-github-actions/setup-gcloud@v2 - if: |- github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, ' - Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: End-to-end test env: CUE_TEST_TOKEN: ${{ secrets.E2E_PORCUEPINE_CUE_TOKEN }} run: |- cd internal/_e2e go test -race - - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Go checks run: |- go vet ./... go mod tidy (cd internal/_e2e && go test -run=-) - - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Check all git tags are available run: |- cd $(mktemp -d) @@ -171,7 +171,7 @@ jobs: echo "Did you forget about refs/attic branches? https://github.com/cue-lang/cue/wiki/Notes-for-project-maintainers" exit 1 fi - - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-22.04') + - if: (matrix.go-version == '1.23.x' && matrix.runner == 'ubuntu-24.04') name: Generate run: |- go run cuelang.org/go/cmd/cue login --token=${CUE_TOKEN} diff --git a/.github/workflows/trybot_dispatch.yaml b/.github/workflows/trybot_dispatch.yaml index cda31939970..ecb9df7b04c 100644 --- a/.github/workflows/trybot_dispatch.yaml +++ b/.github/workflows/trybot_dispatch.yaml @@ -8,7 +8,7 @@ name: Dispatch trybot - ci/test jobs: trybot: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 if: ${{ ((github.ref == 'refs/heads/ci/test') && false) || github.event.client_payload.type == 'trybot' }} defaults: run: diff --git a/internal/ci/repo/repo.cue b/internal/ci/repo/repo.cue index 09787bcb599..60a9981e757 100644 --- a/internal/ci/repo/repo.cue +++ b/internal/ci/repo/repo.cue @@ -26,7 +26,7 @@ protectedBranchPatterns: [defaultBranch, releaseBranchPattern] botGitHubUser: "cueckoo" botGitHubUserEmail: "cueckoo@gmail.com" -linuxMachine: "ubuntu-22.04" +linuxMachine: "ubuntu-24.04" macosMachine: "macos-14" windowsMachine: "windows-2022"