From 1474ce9815feb07971c3ed5164526d1e8e737a73 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 10 Apr 2024 09:23:51 -0400 Subject: [PATCH 1/2] fix: CI ignore git safe.directory checks --- .github/ci-setup-action/action.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/ci-setup-action/action.yml b/.github/ci-setup-action/action.yml index 498fc675841..22be31f4d2e 100644 --- a/.github/ci-setup-action/action.yml +++ b/.github/ci-setup-action/action.yml @@ -19,7 +19,9 @@ runs: - name: Checkout Submodules shell: bash - run: git submodule sync --recursive && git submodule update --init --recursive + run: | + git config --global --add safe.directory '*' + git submodule sync --recursive && git submodule update --init --recursive # Since we use multiple runners, dont want them clashing - name: Generate Unique Home Directory From cd76c4c76a55efa19baf9e50621bde0c7824f1b0 Mon Sep 17 00:00:00 2001 From: ludamad Date: Wed, 10 Apr 2024 09:25:17 -0400 Subject: [PATCH 2/2] Update action.yml --- .github/ci-setup-action/action.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/ci-setup-action/action.yml b/.github/ci-setup-action/action.yml index 22be31f4d2e..879a5fadd06 100644 --- a/.github/ci-setup-action/action.yml +++ b/.github/ci-setup-action/action.yml @@ -10,6 +10,14 @@ runs: # define an action, runs in OS of caller using: composite steps: + # Since we use multiple runners, dont want them clashing + - name: Generate Unique Home Directory + shell: bash + run: | + RUN_HOME=~/run-$RANDOM-$(date +%s) + echo HOME=$RUN_HOME >> $GITHUB_ENV + mkdir -p $RUN_HOME + - name: Cache Submodules id: cache-submodules uses: actions/cache@v3 @@ -23,14 +31,6 @@ runs: git config --global --add safe.directory '*' git submodule sync --recursive && git submodule update --init --recursive - # Since we use multiple runners, dont want them clashing - - name: Generate Unique Home Directory - shell: bash - run: | - RUN_HOME=~/run-$RANDOM-$(date +%s) - echo HOME=$RUN_HOME >> $GITHUB_ENV - mkdir -p $RUN_HOME - # TODO reconsider how jq gets into image - name: Setup jq uses: dcarbone/install-jq-action@v2.1.0