From 315baeb50af0ff66961b36e0fcfc78f8dacb9198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Wed, 18 Sep 2024 21:17:12 +0100
Subject: ci: fix uploading canary (#25715)

If a newer version was available the script was exiting with code 1.
---
 .github/workflows/ci.generate.ts | 4 ++++
 .github/workflows/ci.yml         | 4 ++++
 2 files changed, 8 insertions(+)

(limited to '.github/workflows')

diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index ed73dc69c..33008ce92 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -818,6 +818,8 @@ const ci = {
             "if [ $? -eq 0 ]; then",
             "  echo ${{ github.sha }} > canary-latest.txt",
             '  gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt',
+            "else",
+            '  echo "Skipping upload, because newer canary version is already available"',
             "fi",
           ].join("\n"),
         },
@@ -1101,6 +1103,8 @@ const ci = {
             "if [ $? -eq 0]; then",
             "  echo ${{ github.sha }} > canary-latest.txt",
             '  gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt',
+            "else",
+            '  echo "Skipping upload, because newer canary version is already available"',
             "fi",
           ].join("\n"),
         },
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7b0a0d744..a8ff11c34 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -491,6 +491,8 @@ jobs:
           if [ $? -eq 0 ]; then
             echo ${{ github.sha }} > canary-latest.txt
             gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt
+          else
+            echo "Skipping upload, because newer canary version is already available"
           fi
       - name: Autobahn testsuite
         if: |-
@@ -699,4 +701,6 @@ jobs:
           if [ $? -eq 0]; then
             echo ${{ github.sha }} > canary-latest.txt
             gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt
+          else
+            echo "Skipping upload, because newer canary version is already available"
           fi
-- 
cgit v1.2.3