Fix MacOS Dist (#5)

arduino · Jul 13, 2023 · 0ba1b47 · 0ba1b47
1 parent b88e957
commit 0ba1b47
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/DistTasks.yml b/DistTasks.yml
@@ -194,13 +194,14 @@ tasks:
  desc: Builds Mac OS X 64 bit binaries
  dir: "{{.DIST_DIR}}"
  cmds:
+ # "git config safe.directory" is required until this is fixed https://github.com/elastic/golang-crossbuild/issues/232
  - |
  mkdir {{.PLATFORM_DIR}}
  cp ../LICENSE.txt {{.PLATFORM_DIR}}/
  docker run -v `pwd`/..:/home/build -w /home/build \
  -e CGO_ENABLED=1 \
  {{.CONTAINER}}:{{.CONTAINER_TAG}} \
- --build-cmd "{{.BUILD_COMMAND}}" \
+ --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
  -p "{{.BUILD_PLATFORM}}"
 
  tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}
@@ -218,13 +219,14 @@ tasks:
  desc: Builds Mac OS X ARM64 binaries
  dir: "{{.DIST_DIR}}"
  cmds:
+ # "git config safe.directory" is required until this is fixed https://github.com/elastic/golang-crossbuild/issues/232
  - |
  mkdir {{.PLATFORM_DIR}}
  cp ../LICENSE.txt {{.PLATFORM_DIR}}/
  docker run -v `pwd`/..:/home/build -w /home/build \
  -e CGO_ENABLED=1 \
  {{.CONTAINER}}:{{.CONTAINER_TAG}} \
- --build-cmd "{{.BUILD_COMMAND}}" \
+ --build-cmd "git config --global --add safe.directory /home/build && {{.BUILD_COMMAND}}" \
  -p "{{.BUILD_PLATFORM}}"
 
  tar cz {{.PLATFORM_DIR}} -f {{.PACKAGE_NAME}}