From dcc95112f7a53d94b355cd0cfaedbcee648bfe7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Thu, 19 Sep 2024 14:54:59 +0100
Subject: [PATCH] ci: revert changed to canary uploads (#25733)

All these changes made CI fail consistently with random exit code 1
after successful upload.
---
 .github/workflows/ci.generate.ts | 23 +++++-----------------
 .github/workflows/ci.yml         | 33 ++++++--------------------------
 2 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/.github/workflows/ci.generate.ts b/.github/workflows/ci.generate.ts
index 835d7acbff..8cc57619b2 100755
--- a/.github/workflows/ci.generate.ts
+++ b/.github/workflows/ci.generate.ts
@@ -158,7 +158,7 @@ const cloneRepoStep = [{
     // Use depth > 1, because sometimes we need to rebuild main and if
     // other commits have landed it will become impossible to rebuild if
     // the checkout is too shallow.
-    "fetch-depth": 50,
+    "fetch-depth": 5,
     submodules: false,
   },
 }];
@@ -813,14 +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)/',
-            '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',
-            "else",
-            '  echo "Skipping upload, because newer canary version is already available"',
-            "fi",
+            "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',
           ].join("\n"),
         },
         {
@@ -1087,7 +1081,6 @@ const ci = {
       if:
         "github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'",
       steps: [
-        ...cloneRepoStep,
         authenticateWithGoogleCloud,
         {
           name: "Setup gcloud",
@@ -1099,14 +1092,8 @@ const ci = {
         {
           name: "Upload canary version file to dl.deno.land",
           run: [
-            "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",
-            '  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",
+            "echo ${{ github.sha }} > canary-latest.txt",
+            'gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt',
           ].join("\n"),
         },
       ],
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73eb7c0857..1a10f40630 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,7 +33,7 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 50
+          fetch-depth: 5
           submodules: false
         if: github.event.pull_request.draft == true
       - id: check
@@ -148,7 +148,7 @@ jobs:
       - name: Clone repository
         uses: actions/checkout@v4
         with:
-          fetch-depth: 50
+          fetch-depth: 5
           submodules: false
         if: '!(matrix.skip)'
       - name: Clone submodule ./tests/util/std
@@ -486,14 +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)/
-          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
-          else
-            echo "Skipping upload, because newer canary version is already available"
-          fi
+          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
       - name: Autobahn testsuite
         if: |-
           !(matrix.skip) && ((matrix.os == 'linux' && matrix.arch != 'aarch64') &&
@@ -683,15 +677,6 @@ jobs:
       - build
     if: github.repository == 'denoland/deno' && github.ref == 'refs/heads/main'
     steps:
-      - name: Configure git
-        run: |-
-          git config --global core.symlinks true
-          git config --global fetch.parallel 32
-      - name: Clone repository
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 50
-          submodules: false
       - name: Authenticate with Google Cloud
         uses: google-github-actions/auth@v2
         with:
@@ -705,11 +690,5 @@ jobs:
           project_id: denoland
       - name: Upload canary version file to dl.deno.land
         run: |-
-          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
-            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
+          echo ${{ github.sha }} > canary-latest.txt
+          gsutil -h "Cache-Control: no-cache" cp canary-latest.txt gs://dl.deno.land/canary-latest.txt