From 915b73571c40601b7f79fa4ee0f3035982e23b7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Tue, 17 Sep 2024 17:53:32 +0100
Subject: ci: fix releasing canary (#25689)

---
 .github/workflows/ci.generate.ts | 10 +++++-----
 .github/workflows/ci.yml         | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index 608bb3048..ed73dc69c 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -813,8 +813,8 @@ const ci = {
           ].join("\n"),
           run: [
             'gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/',
-            'lastest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt)',
-            "git cat-file -e $(lastest_canary_hash)",
+            'latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt)',
+            "git cat-file -e $latest_canary_hash",
             "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',
@@ -1096,10 +1096,10 @@ const ci = {
         {
           name: "Upload canary version file to dl.deno.land",
           run: [
-            "lastest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-latest.txt) && \\",
-            "git cat-file -e $(lastest_canary_hash)",
+            "latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-latest.txt)",
+            "git cat-file -e $latest_canary_hash",
             "if [ $? -eq 0]; then",
-            "  echo ${{ github.sha }} > canary-latest.txt && \\",
+            "  echo ${{ github.sha }} > canary-latest.txt",
             '  gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt',
             "fi",
           ].join("\n"),
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e9f7bff07..7b0a0d744 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -486,8 +486,8 @@ jobs:
           github.ref == 'refs/heads/main')
         run: |-
           gsutil -h "Cache-Control: public, max-age=3600" cp ./target/release/*.zip gs://dl.deno.land/canary/$(git rev-parse HEAD)/
-          lastest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt)
-          git cat-file -e $(lastest_canary_hash)
+          latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-$(rustc -vV | sed -n "s|host: ||p")-latest.txt)
+          git cat-file -e $latest_canary_hash
           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
@@ -694,9 +694,9 @@ jobs:
           project_id: denoland
       - name: Upload canary version file to dl.deno.land
         run: |-
-          lastest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-latest.txt) && \
-          git cat-file -e $(lastest_canary_hash)
+          latest_canary_hash=$(gsutil cat gs://dl.deno.land/canary-latest.txt)
+          git cat-file -e $latest_canary_hash
           if [ $? -eq 0]; then
-            echo ${{ github.sha }} > canary-latest.txt && \
+            echo ${{ github.sha }} > canary-latest.txt
             gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt
           fi
-- 
cgit v1.2.3