CI: fix manual git checkout

biojppm · Jul 6, 2024 · 76510b4 · 76510b4
1 parent dcd199c
commit 76510b4
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 10 deletions.
diff --git a/.github/workflows/clang.yml b/.github/workflows/clang.yml
@@ -158,8 +158,16 @@ jobs:
       #... so we checkout manually:
       - name: checkout
         run: |
-          git clone --recursive https://github.com/biojppm/c4core .
-      - run: git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          set -x
+          echo "GITHUB_SERVER_URL=$GITHUB_SERVER_URL"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+          echo "GITHUB_HEAD_REF=$GITHUB_HEAD_REF"
+          git init -q .
+          git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          git remote add $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+          git fetch origin $GITHUB_HEAD_REF
+          git reset --hard FETCH_HEAD
+          git submodule update --init --recursive
       - run: c4core-install ${{matrix.cxx}}
       - {name: show info, run: source .github/setenv.sh && c4_show_info}
       - name: shared64-configure---------------------------------------------------

diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc.yml
@@ -52,8 +52,16 @@ jobs:
       #... so we checkout manually:
       - name: checkout
         run: |
-          git clone --recursive https://github.com/biojppm/c4core .
-      - run: git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          set -x
+          echo "GITHUB_SERVER_URL=$GITHUB_SERVER_URL"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+          echo "GITHUB_HEAD_REF=$GITHUB_HEAD_REF"
+          git init -q .
+          git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          git remote add $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+          git fetch origin $GITHUB_HEAD_REF
+          git reset --hard FETCH_HEAD
+          git submodule update --init --recursive
       - run: c4core-install ${{matrix.cxx}}
       - {name: show info, run: source .github/setenv.sh && c4_show_info}
       - name: shared64-configure---------------------------------------------------
@@ -99,8 +107,16 @@ jobs:
       #... so we checkout manually:
       - name: checkout
         run: |
-          git clone --recursive https://github.com/biojppm/c4core .
-      - run: git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          set -x
+          echo "GITHUB_SERVER_URL=$GITHUB_SERVER_URL"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+          echo "GITHUB_HEAD_REF=$GITHUB_HEAD_REF"
+          git init -q .
+          git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          git remote add $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+          git fetch origin $GITHUB_HEAD_REF
+          git reset --hard FETCH_HEAD
+          git submodule update --init --recursive
       - run: c4core-install ${{matrix.cxx}}
       - {name: show info, run: source .github/setenv.sh && c4_show_info}
       - name: shared64-configure---------------------------------------------------
@@ -174,8 +190,16 @@ jobs:
       #... so we checkout manually:
       - name: checkout
         run: |
-          git clone --recursive https://github.com/biojppm/c4core .
-      - run: git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          set -x
+          echo "GITHUB_SERVER_URL=$GITHUB_SERVER_URL"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+          echo "GITHUB_HEAD_REF=$GITHUB_HEAD_REF"
+          git init -q .
+          git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          git remote add $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+          git fetch origin $GITHUB_HEAD_REF
+          git reset --hard FETCH_HEAD
+          git submodule update --init --recursive
       - run: c4core-install ${{matrix.cxx}}
       - {name: show info, run: source .github/setenv.sh && c4_show_info}
       - name: shared64-configure---------------------------------------------------
@@ -277,8 +301,16 @@ jobs:
       #... so we checkout manually:
       - name: checkout
         run: |
-          git clone --recursive https://github.com/biojppm/c4core .
-      - run: git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          set -x
+          echo "GITHUB_SERVER_URL=$GITHUB_SERVER_URL"
+          echo "GITHUB_REPOSITORY=$GITHUB_REPOSITORY"
+          echo "GITHUB_HEAD_REF=$GITHUB_HEAD_REF"
+          git init -q .
+          git config --system --add safe.directory '*'  # needed for running in the docker image. see https://github.com/actions/checkout/issues/1169
+          git remote add $GITHUB_SERVER_URL/$GITHUB_REPOSITORY
+          git fetch origin $GITHUB_HEAD_REF
+          git reset --hard FETCH_HEAD
+          git submodule update --init --recursive
       - name: install gcc-arm-linux-gnueabihf
         run: |
           c4core-install arm-linux-gnueabihf