From 5d793a27ea0a59dfe7d3a7b66a89aee4d2b47921 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Thu, 5 Sep 2024 10:02:19 +0100 Subject: [PATCH] internal/ci: re-baseline base from cue-lang/cue@2d329b54 Signed-off-by: Paul Jolly Change-Id: Ie2e933362b83c39e617f52e8b2348978542ee0c7 Dispatch-Trailer: {"type":"trybot","CL":1200726,"patchset":2,"ref":"refs/changes/26/1200726/2","targetBranch":"master"} --- .github/workflows/evict_caches.yml | 4 ++-- internal/ci/base/base.cue | 2 +- internal/ci/base/github.cue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/evict_caches.yml b/.github/workflows/evict_caches.yml index 2fd672230..2edee16a8 100644 --- a/.github/workflows/evict_caches.yml +++ b/.github/workflows/evict_caches.yml @@ -89,7 +89,7 @@ jobs: echo Latest commit: $sha echo "Trigger workflow on cue-lang/cuelang.org" - curl -s -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.CUECKOO_GITHUB_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" --fail-with-body -X POST https://api.github.com/repos/cue-lang/cuelang.org/actions/workflows/trybot.yml/dispatches -d "{\"ref\":\"$j\"}" + curl -s -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.CUECKOO_GITHUB_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" --fail-with-body -X POST https://api.github.com/repos/cue-lang/cuelang.org/actions/workflows/trybot.yaml/dispatches -d "{\"ref\":\"$j\"}" # Ensure that the trybot repo has the latest commit for # this branch. If the force-push results in a commit @@ -121,7 +121,7 @@ jobs: # We are up-to-date, i.e. the push did nothing, hence we need to trigger a workflow_dispatch # in the trybot repo. echo "Trigger workflow on cue-lang/cuelang.org-trybot" - curl -s -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.CUECKOO_GITHUB_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" --fail-with-body -X POST https://api.github.com/repos/cue-lang/cuelang.org-trybot/actions/workflows/trybot.yml/dispatches -d "{\"ref\":\"$j\"}" + curl -s -L -H "Accept: application/vnd.github+json" -H "Authorization: Bearer ${{ secrets.CUECKOO_GITHUB_PAT }}" -H "X-GitHub-Api-Version: 2022-11-28" --fail-with-body -X POST https://api.github.com/repos/cue-lang/cuelang.org-trybot/actions/workflows/trybot.yaml/dispatches -d "{\"ref\":\"$j\"}" else echo "Force-push to cue-lang/cuelang.org-trybot did work; nothing to do" fi diff --git a/internal/ci/base/base.cue b/internal/ci/base/base.cue index c0dea7dd9..5304b85f1 100644 --- a/internal/ci/base/base.cue +++ b/internal/ci/base/base.cue @@ -55,7 +55,7 @@ botGerritHubUser: *botGitHubUser | string botGerritHubUserPasswordSecretsKey: *(strings.ToUpper(botGitHubUser) + "_GERRITHUB_PASSWORD") | string botGerritHubUserEmail: *botGitHubUserEmail | string -workflowFileExtension: ".yml" +workflowFileExtension: ".yaml" linuxMachine: string diff --git a/internal/ci/base/github.cue b/internal/ci/base/github.cue index 5b1c4ce0a..6f49044bd 100644 --- a/internal/ci/base/github.cue +++ b/internal/ci/base/github.cue @@ -137,7 +137,7 @@ checkoutCode: { earlyChecks: json.#step & { name: "Early git and code sanity checks" - run: "go run cuelang.org/go/internal/ci/checks@v0.11.0-0.dev.0.20240903133435-46fb300df650" + run: *"go run cuelang.org/go/internal/ci/checks@v0.11.0-0.dev.0.20240903133435-46fb300df650" | string } curlGitHubAPI: {