fix: ci github clone edge case (#9320)

overdue
AztecProtocol · Oct 22, 2024 · 15abe6f · 15abe6f
1 parent d4dea16
commit 15abe6f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/ensure-builder/action.yml b/.github/ensure-builder/action.yml
@@ -69,21 +69,24 @@ runs:
     # Set up a context for this run
     - name: Copy Repo to Builder
       shell: bash
+      env:
+        UNPACK: |
+          [ -d ~/run-$RUN_ID ] || (
+            mkdir -p ~/run-$RUN_ID-git &&
+            cd ~/run-$RUN_ID-git && tar xzf - &&
+            git config --global advice.detachedHead false &&
+            git clone ~/run-$RUN_ID-git/.git ~/run-$RUN_ID &&
+            echo ${{ env.BUILD_INSTANCE_SSH_KEY }} | base64 --decode > ~/.ssh/build_instance_key &&
+            chmod 600 ~/.ssh/build_instance_key
+          )
       run: |
         sudo shutdown -P ${{ steps.select_instance.outputs.ttl }}
         set -x
         # detect run folder
         if ! scripts/run_on_builder "[ -d ~/run-$RUN_ID ]" ; then
           echo "Copying local repo to spot"
-          tar czf - .git | scripts/run_on_builder \
-            "mkdir -p ~/run-$RUN_ID-git && cd ~/run-$RUN_ID-git && tar xzf -" || true
-          scripts/run_on_builder "
-            echo "Unpacking repo"
-            git config --global advice.detachedHead false
-            git clone ~/run-$RUN_ID-git/.git ~/run-$RUN_ID
-            echo ${{ env.BUILD_INSTANCE_SSH_KEY }} | base64 --decode > ~/.ssh/build_instance_key
-            chmod 600 ~/.ssh/build_instance_key
-          " || true
+          (tar czf - .git || true) | scripts/run_on_builder \
+            "flock ~/git.lock bash -c '$UNPACK'"
         fi
 
     - name: Attach EBS Cache Disk

diff --git a/yarn-project/README.md b/yarn-project/README.md
@@ -48,7 +48,7 @@ Consider installing the Prettier and ESLint extensions if using VSCode. Configur
 
 ## Package.json inheritance
 
-To simplify the management of all package.json files, we have a custom script that injects the contents of `package.common.json` into all packages that reference it via the `inherits` custom field. To run the script, just run
+To simplify the management of all package.json files, we have a custom script that injects the contents of `package.common.json` into all packages that reference it via the `inherits` custom field. To run the script, just run:
 
 ```
 yarn prepare