From 7cc4059f3468eb06dec0799183c05621980a0471 Mon Sep 17 00:00:00 2001 From: Paul Jolly Date: Thu, 2 Nov 2023 16:14:26 +0000 Subject: [PATCH] deps: bump netlify-cli dependency to 17.0.1 Per: https://answers.netlify.com/t/under-the-hood-changes-to-go-function-uploads-please-update-your-netlify-cli-version/104726 Signed-off-by: Paul Jolly Change-Id: I6e242c5590b6ee8ab71b3be73b89a9c60f1a28b7 Dispatch-Trailer: {"type":"trybot","CL":1171600,"patchset":3,"ref":"refs/changes/00/1171600/3","targetBranch":"master"} --- .github/workflows/trybot.yml | 5 +++++ .github/workflows/update_tip.yml | 2 +- internal/ci/github/trybot.cue | 4 ++++ internal/ci/repo/repo.cue | 2 +- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/trybot.yml b/.github/workflows/trybot.yml index 399e6d704e..8c1771c8b4 100644 --- a/.github/workflows/trybot.yml +++ b/.github/workflows/trybot.yml @@ -192,6 +192,11 @@ jobs: run: ./build.bash - 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.repository == 'cue-lang/cuelang.org-trybot' && (contains(github.event.head_commit.message, ' + Dispatch-Trailer: {"type":"trybot"')) + name: Install Netlify CLI + run: npm install -g netlify-cli@17.0.1 - if: |- github.repository == 'cue-lang/cuelang.org-trybot' && (contains(github.event.head_commit.message, ' Dispatch-Trailer: {"type":"trybot"')) diff --git a/.github/workflows/update_tip.yml b/.github/workflows/update_tip.yml index 9459e60b4d..9520f6c410 100644 --- a/.github/workflows/update_tip.yml +++ b/.github/workflows/update_tip.yml @@ -98,7 +98,7 @@ jobs: env: BRANCH: tip - name: Install Netlify CLI - run: npm install -g netlify-cli@12.4.0 + run: npm install -g netlify-cli@17.0.1 - name: Deploy tip run: netlify deploy -f functions -d _public -m "Deploy tip" -s cue-tip --debug --prod env: diff --git a/internal/ci/github/trybot.cue b/internal/ci/github/trybot.cue index c258ab9b47..31a9204835 100644 --- a/internal/ci/github/trybot.cue +++ b/internal/ci/github/trybot.cue @@ -99,6 +99,10 @@ workflows: trybot: _repo.bashWorkflow & { _dist, _repo.checkGitClean, + _installNetlifyCLI & { + if: "github.repository == '\(_repo.trybotRepositoryPath)' && \(_repo.containsTrybotTrailer)" + }, + // Only run a deploy of tip if we are running as part of the trybot repo, // with a TryBot-Trailer, i.e. as part of CI check of the trybot workflow _netlifyDeploy & { diff --git a/internal/ci/repo/repo.cue b/internal/ci/repo/repo.cue index ecc3451caa..48ee186011 100644 --- a/internal/ci/repo/repo.cue +++ b/internal/ci/repo/repo.cue @@ -37,7 +37,7 @@ hugoVersion: "0.115.4" // netlifyCLIVersion is the version of the Netlify CLI used to deploy tip and // deploy previews of CLs -netlifyCLIVersion: "12.4.0" +netlifyCLIVersion: "17.0.1" netlifySites: { cls: "cue-cls"