update internal/ci/base to switch to cue.gerrithub.io

mvdan · porcuepine · commit 472ea7c85749 · 2025-11-11T19:19:56.000Z
Signed-off-by: Daniel Martí &lt;mvdan@mvdan.cc&gt;
Change-Id: I7b4168af0e4a545da6b5290b1eff09831f83521f
Dispatch-Trailer: {"type":"trybot","CL":1226128,"patchset":1,"ref":"refs/changes/28/1226128/1","targetBranch":"main"}
diff --git a/.github/workflows/push_tip_to_trybot.yaml b/.github/workflows/push_tip_to_trybot.yaml
@@ -1,18 +1,23 @@
 # Code generated internal/ci/ci_tool.cue; DO NOT EDIT.
 
+name: Push tip to trybot
+"on":
+  push:
+    branches:
+      - main
 concurrency: push_tip_to_trybot
 jobs:
   push:
     defaults:
       run:
         shell: bash --noprofile --norc -euo pipefail {0}
-    runs-on: ns-linux-amd64
+    runs-on: namespace-profile-linux-amd64;overrides.cache-tag=cue-dispatch-workflow
     if: ${{github.repository == 'cue-labs/oci'}}
     steps:
       - name: Write netrc file for porcuepine Gerrithub
         run: |-
           cat <<EOD > ~/.netrc
-          machine review.gerrithub.io
+          machine cue.gerrithub.io
           login porcuepine
           password ${{ secrets.PORCUEPINE_GERRITHUB_PASSWORD }}
           EOD
@@ -25,7 +30,7 @@ jobs:
           git config user.name porcuepine
           git config user.email cue.porcuepine@gmail.com
           git config http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n porcuepine:${{ secrets.PORCUEPINE_GITHUB_PAT }} | base64)"
-          git remote add origin https://review.gerrithub.io/a/cue-labs/oci
+          git remote add origin https://cue.gerrithub.io/a/cue-labs/oci
           git remote add trybot https://github.com/cue-labs/oci-trybot
 
           git fetch origin "${{ github.ref }}"
@@ -43,8 +48,3 @@ jobs:
           	 echo "Giving up"
           	 exit 1
           fi
-name: Push tip to trybot
-"on":
-  push:
-    branches:
-      - main
diff --git a/.github/workflows/trybot.yaml b/.github/workflows/trybot.yaml
@@ -15,21 +15,21 @@ jobs:
     defaults:
       run:
         shell: bash --noprofile --norc -euo pipefail {0}
-    runs-on: ns-linux-amd64
+    runs-on: namespace-profile-linux-amd64
     if: |-
       (contains(github.event.head_commit.message, '
       Dispatch-Trailer: {"type":"trybot"')) || ! (contains(github.event.head_commit.message, '
       Dispatch-Trailer: {"type":"'))
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
       - name: Reset git directory modification times
         run: touch -t 202211302355 $(find * -type d)
       - name: Restore git file modification times
-        uses: chetan/git-restore-mtime-action@075f9bc9d159805603419d50f794bd9f33252ebe
+        uses: chetan/git-restore-mtime-action@cbf8161ddb4e9b162409104954fb540e8a38c1da
       - id: DispatchTrailer
         name: Try to extract Dispatch-Trailer
         run: |-
@@ -56,14 +56,12 @@ jobs:
           echo "github.event.head_commit.message contains Dispatch-Trailer but we are on a protected branch"
           false
       - name: Install Go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v6
         with:
           cache: false
-          go-version: 1.24.x
+          go-version: 1.25.x
       - name: Set common go env vars
         run: |-
-          go env -w GOTOOLCHAIN=local
-
           case $(go env GOARCH) in
           amd64) go env -w GOAMD64=v3 ;;   # 2013 and later; makes `go test -race` 15% faster
           arm64) go env -w GOARM64=v8.6 ;; # Apple M2 and later
@@ -75,13 +73,12 @@ jobs:
         uses: namespacelabs/nscloud-cache-action@v1
         with:
           cache: go
-          path: ${{ runner.temp }}/staticcheck
       - if: |-
           github.repository == 'cue-labs/oci' && (((github.ref == 'refs/heads/main') && (! (contains(github.event.head_commit.message, '
           Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test'))
         run: go env -w GOFLAGS=-count=1
       - name: Early git and code sanity checks
-        run: go run cuelang.org/go/internal/ci/checks@v0.13.2
+        run: go run cuelang.org/go/internal/ci/checks@v0.14.1
       - working-directory: cmd/ocisrv
         name: Generate cmd/ocisrv
         run: go generate ./...
diff --git a/.github/workflows/trybot_dispatch.yaml b/.github/workflows/trybot_dispatch.yaml
@@ -11,13 +11,13 @@ jobs:
     defaults:
       run:
         shell: bash --noprofile --norc -euo pipefail {0}
-    runs-on: ns-linux-amd64
+    runs-on: namespace-profile-linux-amd64;overrides.cache-tag=cue-dispatch-workflow
     if: ${{ ((github.ref == 'refs/heads/ci/test') && false) || github.event.client_payload.type == 'trybot' }}
     steps:
       - name: Write netrc file for porcuepine Gerrithub
         run: |-
           cat <<EOD > ~/.netrc
-          machine review.gerrithub.io
+          machine cue.gerrithub.io
           login porcuepine
           password ${{ secrets.PORCUEPINE_GERRITHUB_PASSWORD }}
           EOD
@@ -40,7 +40,7 @@ jobs:
           git config user.name porcuepine
           git config user.email cue.porcuepine@gmail.com
           git config http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n porcuepine:${{ secrets.PORCUEPINE_GITHUB_PAT }} | base64)"
-          git remote add origin  https://review.gerrithub.io/a/cue-labs/oci
+          git remote add origin  https://cue.gerrithub.io/a/cue-labs/oci
 
           git fetch origin ${{ fromJSON(steps.payload.outputs.value).ref }}
           git checkout -b local_${{ fromJSON(steps.payload.outputs.value).targetBranch }} FETCH_HEAD
@@ -65,7 +65,10 @@ jobs:
           ${{ toJSON(fromJSON(steps.payload.outputs.value)) }}
           EOD
           )"
-          git log -1 --format=%B | git interpret-trailers --trailer "Dispatch-Trailer: $trailer" | git commit --amend -F -
+          # --no-divider prevents a "---" line from marking the end of the commit message.
+          # Here, we know that the input is exactly one commit message,
+          # so don't do weird things if the commit message has a "---" line.
+          git log -1 --format=%B | git interpret-trailers --no-divider --trailer "Dispatch-Trailer: $trailer" | git commit --amend -F -
           git log -1
 
           success=false
@@ -90,7 +93,7 @@ jobs:
           git config user.name porcuepine
           git config user.email cue.porcuepine@gmail.com
           git config http.https://github.com/.extraheader "AUTHORIZATION: basic $(echo -n porcuepine:${{ secrets.PORCUEPINE_GITHUB_PAT }} | base64)"
-          git remote add origin  https://review.gerrithub.io/a/cue-labs/oci
+          git remote add origin  https://cue.gerrithub.io/a/cue-labs/oci
 
           git fetch origin ${{ github.event.client_payload.ref }}
           git checkout -b local_${{ github.event.client_payload.targetBranch }} FETCH_HEAD
@@ -115,7 +118,10 @@ jobs:
           ${{ toJSON(github.event.client_payload) }}
           EOD
           )"
-          git log -1 --format=%B | git interpret-trailers --trailer "Dispatch-Trailer: $trailer" | git commit --amend -F -
+          # --no-divider prevents a "---" line from marking the end of the commit message.
+          # Here, we know that the input is exactly one commit message,
+          # so don't do weird things if the commit message has a "---" line.
+          git log -1 --format=%B | git interpret-trailers --no-divider --trailer "Dispatch-Trailer: $trailer" | git commit --amend -F -
           git log -1
 
           success=false
diff --git a/codereview.cfg b/codereview.cfg
@@ -1,4 +1,4 @@
 # Code generated internal/ci/ci_tool.cue; DO NOT EDIT.
 
 github: https://github.com/cue-labs/oci
-gerrit: https://review.gerrithub.io/a/cue-labs/oci
+gerrit: https://cue.gerrithub.io/a/cue-labs/oci
diff --git a/internal/ci/cue.mod/module.cue b/internal/ci/cue.mod/module.cue
@@ -8,7 +8,7 @@ deps: {
 		default: true
 	}
 	"github.com/cue-lang/tmp/internal/ci@v0": {
-		v:       "v0.0.3"
+		v:       "v0.0.10"
 		default: true
 	}
 }
diff --git a/internal/ci/repo/repo.cue b/internal/ci/repo/repo.cue
@@ -16,8 +16,6 @@ botGitHubUserEmail: "cue.porcuepine@gmail.com"
 
 defaultBranch: "main"
 
-latestGo: "1.24.x"
-
 // modules is a list of Unix paths of go.mod files for go modules in this
 // repository
 modules: [...string]

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ deps: {`
`8`	`8`	`default: true`
`9`	`9`	`}`
`10`	`10`	`"github.com/cue-lang/tmp/internal/ci@v0": {`
`11`		`- v: "v0.0.3"`
	`11`	`+ v: "v0.0.10"`
`12`	`12`	`default: true`
`13`	`13`	`}`
`14`	`14`	`}`