Skip to content

Commit

Permalink
internal/ci: bump to use ubuntu-22.04 as our linux machine
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Jolly <paul@myitcv.io>
Change-Id: I81c62bb349ef8868e09a7035f2e1f1bf6ce102d4
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/551251
TryBot-Result: CUEcueckoo <cueckoo@cuelang.org>
Reviewed-by: Daniel Martí <mvdan@mvdan.cc>
  • Loading branch information
myitcv committed Mar 19, 2023
1 parent 38ee1c2 commit 4686700
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/push_tip_to_trybot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ name: Push tip to trybot
concurrency: push_tip_to_trybot
jobs:
push:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ name: Release
concurrency: release
jobs:
goreleaser:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tip_triggers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ name: Triggers on push to tip
- master
jobs:
push:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
defaults:
run:
shell: bash
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/trybot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- 1.18.x
- 1.19.x
os:
- ubuntu-20.04
- ubuntu-22.04
- macos-11
- windows-2022
runs-on: ${{ matrix.os }}
Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:
${{ steps.go-cache-dir.outputs.dir }}
key: ${{ runner.os }}-${{ matrix.go-version }}-${{ github.run_id }}
restore-keys: ${{ runner.os }}-${{ matrix.go-version }}
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
name: Early git and code sanity checks
run: |-
# Ensure the recent commit messages have Signed-off-by headers.
Expand All @@ -80,23 +80,23 @@ jobs:
exit 1
fi
done
- if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) || (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) || (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
run: echo CUE_LONG=true >> $GITHUB_ENV
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
name: Generate
run: go generate ./...
- if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) || !(matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) || !(matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
name: Test
run: go test ./...
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
name: Test with -race
run: go test -race ./...
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
name: Check
run: go vet ./...
- name: Check that git is clean at the end of the job
run: test -z "$(git status --porcelain)" || (git status; git diff; false)
- if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-20.04')
- if: (github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (matrix.go-version == '1.19.x' && matrix.os == 'ubuntu-22.04')
name: Pull this commit through the proxy on master
run: |-
v=$(git rev-parse HEAD)
Expand Down
2 changes: 1 addition & 1 deletion internal/ci/github/workflows.cue
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ _#isProtectedBranch: "(" + strings.Join([ for branch in _#protectedBranchPattern

_#isReleaseTag: (_#matchPattern & {variable: "github.ref", pattern: "refs/tags/\(core.#releaseTagPattern)"}).expr

_#linuxMachine: "ubuntu-20.04"
_#linuxMachine: "ubuntu-22.04"
_#macosMachine: "macos-11"
_#windowsMachine: "windows-2022"

Expand Down

0 comments on commit 4686700

Please sign in to comment.