guix: "Invert" guix-start/guix-check cmd-line argument behaviour,…

… defaults to `pwd`
dashpay · Nov 12, 2024 · 3ac5739 · 3ac5739
1 parent 187a4f1
commit 3ac5739
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/guix-build.yml b/.github/workflows/guix-build.yml
@@ -114,7 +114,7 @@ jobs:
             -v ${{ github.workspace }}/.cache:/home/ubuntu/.cache \
             -w /src/dash \
             ghcr.io/${{ needs.build-image.outputs.repo-name }}/dashcore-guix-builder:${{ needs.build-image.outputs.image-tag }} && \
-          docker exec guix-daemon bash -c 'HOSTS=${{ matrix.build_target }} /usr/local/bin/guix-start'
+          docker exec guix-daemon bash -c 'HOSTS=${{ matrix.build_target }} /usr/local/bin/guix-start /src/dash'
 
       - name: Ensure build passes
         run: |

diff --git a/contrib/containers/guix/scripts/guix-check b/contrib/containers/guix/scripts/guix-check
@@ -2,11 +2,7 @@
 
 set -eo pipefail
 
-if [[ -n "${1}" ]]; then
-    WORKSPACE_PATH="$1"
-else
-    WORKSPACE_PATH="/src/dash"
-fi
+WORKSPACE_PATH="${1:-$(pwd)}"
 
 if [[ ! -d "$WORKSPACE_PATH" ]]; then
     echo "$0: $WORKSPACE_PATH is not a valid directory, exiting!"

diff --git a/contrib/containers/guix/scripts/guix-start b/contrib/containers/guix/scripts/guix-start
@@ -2,11 +2,7 @@
 
 set -eo pipefail
 
-if [[ -n "${1}" ]]; then
-    WORKSPACE_PATH="$1"
-else
-    WORKSPACE_PATH="/src/dash"
-fi
+WORKSPACE_PATH="${1:-$(pwd)}"
 
 if [[ ! -d "$WORKSPACE_PATH" ]]; then
     echo "$0: $WORKSPACE_PATH is not a valid directory, exiting!"
@@ -25,8 +21,11 @@ if [[ ! -d "${SDK_PATH}/${XCODE_ARCHIVE}" ]]; then
     curl -L https://bitcoincore.org/depends-sources/sdks/${XCODE_ARCHIVE}.tar.gz | tar -xz -C "${SDK_PATH}"
 fi
 
-# Avoid adding duplicate safe.directory option
-git config --global --fixed-value --get safe.directory "${WORKSPACE_PATH}" || git config --global --add safe.directory "${WORKSPACE_PATH}"
+# Add safe.directory option only when WORKSPACE_PATH was specified via cmd-line arguments (happens in CI)
+if [[ -n "${1}" ]]; then
+    # Avoid adding duplicates
+    git config --global --fixed-value --get safe.directory "${WORKSPACE_PATH}" || git config --global --add safe.directory "${WORKSPACE_PATH}"
+fi
 
 cd "${WORKSPACE_PATH}"
 git status >> /dev/null