Merge branch 'main' into testnet

oasysgames · Jun 14, 2024 · 7076770 · 7076770
2 parents 2d9bcd9 + c4c752b
commit 7076770
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,6 +19,9 @@ jobs:
         with:
           submodules: true
 
+      - name: Set up a Git safe directory
+        run: git config --global --add safe.directory ${{ github.workspace }}
+
       - name: Build Binary - ${{ matrix.os }} ${{ matrix.arch }}
         if: matrix.arch == 'amd64'
         run: |
@@ -27,7 +30,7 @@ jobs:
             -w ${{ github.workspace }} \
             -e GOOS=${{ matrix.os }} \
             -e GOARCH=${{ matrix.arch }} \
-            golang:1.17.8-buster make geth
+            golang:1.20.14-bookworm sh -c "git config --global --add safe.directory ${{ github.workspace }} && make geth"
 
       - name: Build Binary - ${{ matrix.os }} ${{ matrix.arch }}
         if: matrix.arch == 'arm64'
@@ -38,7 +41,7 @@ jobs:
             -w ${{ github.workspace }} \
             -e GOOS=${{ matrix.os }} \
             -e GOARCH=${{ matrix.arch }} \
-            arm64v8/golang:1.17.8-buster make geth
+            arm64v8/golang:1.20.14-bookworm sh -c "git config --global --add safe.directory ${{ github.workspace }} && make geth"
 
       - name: Check version label
         if: matrix.arch == 'amd64'