Merge branch 'master' into gitian_sigs

zcash · Sep 28, 2024 · 83b5b61 · 83b5b61
2 parents 0d265a8 + 2eb12be
commit 83b5b61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/CI.yaml b/.github/workflows/CI.yaml
@@ -268,4 +268,4 @@ jobs:
           git push # debug
         fi
         echo "last step"
-        #gcloud compute instances delete "test-gitian-$random" --project "${{ secrets.GCP_PROJECT_ID_PROD }}" --zone "us-central1-a" --delete-disks=all # debug
+        #gcloud compute instances delete "test-gitian-$random" --project "${{ secrets.GCP_PROJECT_ID_PROD }}" --zone "us-central1-a" --delete-disks=all # debug
diff --git a/roles/gitian/templates/gitian-parallel-build.sh b/roles/gitian/templates/gitian-parallel-build.sh
@@ -264,4 +264,4 @@ then
     done
 
     popd
-fi
+fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -264,4 +264,4 @@ then @@
         done
         popd
-    fi
+    fi