From 0c4df9b32cfa68ae7a84de412e5968785924d76b Mon Sep 17 00:00:00 2001 From: Hans-Kristian Arntzen Date: Tue, 19 Apr 2022 16:15:41 +0200 Subject: [PATCH] ci: Workaround safe directory errors in vkd3d_build generation. See https://github.com/actions/checkout/issues/760 for reference. Signed-off-by: Hans-Kristian Arntzen --- .github/workflows/artifacts.yml | 1 + .github/workflows/test-build-linux.yml | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index 51dec8e0..9ce806d3 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -19,6 +19,7 @@ jobs: with: command: | export VERSION_NAME="${GITHUB_REF##*/}-${GITHUB_SHA##*/}" + git config --global --add safe.directory "$GITHUB_WORKSPACE" ./package-release.sh ${VERSION_NAME} build --no-package echo "VERSION_NAME=${VERSION_NAME}" >> $GITHUB_ENV diff --git a/.github/workflows/test-build-linux.yml b/.github/workflows/test-build-linux.yml index 69b05d13..cd22fc23 100644 --- a/.github/workflows/test-build-linux.yml +++ b/.github/workflows/test-build-linux.yml @@ -21,6 +21,7 @@ jobs: uses: Joshua-Ashton/arch-mingw-github-action@v7 with: command: | + git config --global --add safe.directory "$GITHUB_WORKSPACE" meson -Denable_tests=True -Denable_extras=True --cross-file=build-win32.txt --buildtype release build-mingw-x86 ninja -C build-mingw-x86 @@ -29,6 +30,7 @@ jobs: uses: Joshua-Ashton/arch-mingw-github-action@v7 with: command: | + git config --global --add safe.directory "$GITHUB_WORKSPACE" meson -Denable_tests=True -Denable_extras=True --cross-file=build-win64.txt --buildtype release build-mingw-x64 ninja -C build-mingw-x64 @@ -40,6 +42,7 @@ jobs: export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig" + git config --global --add safe.directory "$GITHUB_WORKSPACE" meson -Denable_tests=True -Denable_extras=True --buildtype release build-native-gcc-x86 ninja -C build-native-gcc-x86 @@ -50,6 +53,7 @@ jobs: command: | export CC="gcc" export CXX="g++" + git config --global --add safe.directory "$GITHUB_WORKSPACE" meson -Denable_tests=True -Denable_extras=True --buildtype release build-native-gcc-x64 ninja -C build-native-gcc-x64 @@ -61,6 +65,7 @@ jobs: export CC="clang -m32" export CXX="clang++ -m32" export PKG_CONFIG_PATH="/usr/lib32/pkgconfig:/usr/lib/i386-linux-gnu/pkgconfig:/usr/lib/pkgconfig" + git config --global --add safe.directory "$GITHUB_WORKSPACE" meson -Denable_tests=True -Denable_extras=True --buildtype release build-native-clang-x86 ninja -C build-native-clang-x86 @@ -71,5 +76,6 @@ jobs: command: | export CC="clang" export CXX="clang++" + git config --global --add safe.directory "$GITHUB_WORKSPACE" meson -Denable_tests=True -Denable_extras=True --buildtype release build-native-clang-x64 ninja -C build-native-clang-x64