Skip to content

Commit 8250c1f

Browse files
mvdanmvdan
committed
internal/ci: rename "ubuntu" runner to "linux"
For consistency with the MacOS and Windows runners, name the Linux runner just "linux" rather than "ubuntu". We don't actually care which Linux distribution is used, even though that is still fully under our control. Signed-off-by: Daniel Martí <[email protected]> Change-Id: I885caf8e0597caa4ca5c9f2202182104ba80da3f Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1218449 TryBot-Result: CUEcueckoo <[email protected]> Unity-Result: CUE porcuepine <[email protected]> Reviewed-by: Matthew Sackman <[email protected]>
1 parent dbed9a3 commit 8250c1f

File tree

6 files changed

+19
-19
lines changed

6 files changed

+19
-19
lines changed

‎.github/workflows/push_tip_to_trybot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ jobs:
66
defaults:
77
run:
88
shell: bash --noprofile --norc -euo pipefail {0}
9-
runs-on: ns-ubuntu-amd64
9+
runs-on: ns-linux-amd64
1010
if: ${{github.repository == 'cue-lang/cue'}}
1111
steps:
1212
- name: Write netrc file for cueckoo Gerrithub

‎.github/workflows/release.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
defaults:
1717
run:
1818
shell: bash --noprofile --norc -euo pipefail {0}
19-
runs-on: ns-ubuntu-amd64
19+
runs-on: ns-linux-amd64
2020
if: ${{github.repository == 'cue-lang/cue'}}
2121
steps:
2222
- name: Checkout code
@@ -57,7 +57,7 @@ jobs:
5757
uses: actions/setup-go@v5
5858
with:
5959
cache: false
60-
go-version: 1.24.4
60+
go-version: 1.24.5
6161
- name: Set common go env vars
6262
run: |-
6363
go env -w GOTOOLCHAIN=local

‎.github/workflows/tip_triggers.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
defaults:
1212
run:
1313
shell: bash --noprofile --norc -euo pipefail {0}
14-
runs-on: ns-ubuntu-amd64
14+
runs-on: ns-linux-amd64
1515
if: ${{github.repository == 'cue-lang/cue'}}
1616
steps:
1717
- name: Trigger unity build

‎.github/workflows/trybot.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- 1.23.x
2626
- 1.24.x
2727
runner:
28-
- ns-ubuntu-amd64
28+
- ns-linux-amd64
2929
- ns-macos-arm64
3030
- ns-windows-amd64
3131
runs-on: ${{ matrix.runner }}
@@ -94,22 +94,22 @@ jobs:
9494
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test'))
9595
run: go env -w GOFLAGS=-count=1
9696
- run: go run cuelang.org/go/cmd/cue login --token=${{ secrets.NOTCUECKOO_CUE_TOKEN }}
97-
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
97+
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
9898
name: Early git and code sanity checks
9999
run: go run ./internal/ci/checks
100100
- if: |-
101101
((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
102-
Dispatch-Trailer: {"type":"')))) || !(matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
102+
Dispatch-Trailer: {"type":"')))) || !(matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
103103
name: Test
104104
run: go test ./...
105-
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
105+
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
106106
name: Test with -race
107107
env:
108108
GORACE: atexit_sleep_ms=10
109109
run: go test -race ./...
110110
- if: |-
111111
(((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
112-
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
112+
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
113113
name: Test on 32 bits
114114
env:
115115
GOARCH: "386"
@@ -119,32 +119,32 @@ jobs:
119119
- id: auth
120120
if: |-
121121
github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
122-
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
122+
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
123123
name: gcloud auth for end-to-end tests
124124
uses: google-github-actions/auth@v2
125125
with:
126126
credentials_json: ${{ secrets.E2E_GCLOUD_KEY }}
127127
- if: |-
128128
github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
129-
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
129+
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
130130
name: gcloud setup for end-to-end tests
131131
uses: google-github-actions/setup-gcloud@v2
132132
- if: |-
133133
github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
134-
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
134+
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
135135
name: End-to-end test
136136
env:
137137
CUE_TEST_TOKEN: ${{ secrets.E2E_PORCUEPINE_CUE_TOKEN }}
138138
run: |-
139139
cd internal/_e2e
140140
go test -race
141-
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
141+
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
142142
name: Go checks
143143
run: |-
144144
go vet ./...
145145
go mod tidy
146146
(cd internal/_e2e && go test -run=-)
147-
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
147+
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
148148
name: staticcheck
149149
uses: dominikh/staticcheck-action@v1
150150
with:
@@ -153,7 +153,7 @@ jobs:
153153
use-cache: false
154154
- if: |-
155155
(((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
156-
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
156+
Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
157157
name: Check all git tags are available
158158
run: |-
159159
cd $(mktemp -d)
@@ -169,7 +169,7 @@ jobs:
169169
echo "Did you forget about refs/attic branches? https://github.com/cue-lang/cue/wiki/Notes-for-project-maintainers"
170170
exit 1
171171
fi
172-
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-ubuntu-amd64')
172+
- if: (matrix.go-version == '1.24.x' && matrix.runner == 'ns-linux-amd64')
173173
name: Generate
174174
run: go generate ./...
175175
- if: always()

‎.github/workflows/trybot_dispatch.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
defaults:
1212
run:
1313
shell: bash --noprofile --norc -euo pipefail {0}
14-
runs-on: ns-ubuntu-amd64
14+
runs-on: ns-linux-amd64
1515
if: ${{ ((github.ref == 'refs/heads/ci/test') && false) || github.event.client_payload.type == 'trybot' }}
1616
steps:
1717
- name: Write netrc file for cueckoo Gerrithub

‎internal/ci/repo/repo.cue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ protectedBranchPatterns: [defaultBranch, releaseBranchPattern]
2626
botGitHubUser: "cueckoo"
2727
botGitHubUserEmail: "[email protected]"
2828

29-
linuxMachine: "ns-ubuntu-amd64"
29+
linuxMachine: "ns-linux-amd64"
3030
macosMachine: "ns-macos-arm64"
3131
windowsMachine: "ns-windows-amd64"
3232

@@ -42,7 +42,7 @@ matrixGo: ["1.23.x", latestGo]
4242
// Use a specific latest version for release builds.
4343
// Note that we don't want ".x" for the sake of reproducibility,
4444
// so we instead pin a specific Go release.
45-
pinnedReleaseGo: "1.24.4"
45+
pinnedReleaseGo: "1.24.5"
4646

4747
goreleaserVersion: "v2.10.2"
4848

0 commit comments

Comments
 (0)