From 514edfec074dc6d1355364b6365e7d9ab87e578c Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Tue, 12 Apr 2022 19:40:25 -1000 Subject: [PATCH] build-system: work around latest GitHub Action issue This suddenly started. A couple of build would fail because the git submodule checkout fails because of directory ownership issues. Hopefully this will fix it. Signed-off-by: Dirk Hohndel --- .github/workflows/linux-bionic-5.9.yml | 2 ++ .github/workflows/linux-focal-5.12.yml | 2 ++ .github/workflows/linux-impish-5.15.yml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/.github/workflows/linux-bionic-5.9.yml b/.github/workflows/linux-bionic-5.9.yml index ce6a608f7..65673d6ec 100644 --- a/.github/workflows/linux-bionic-5.9.yml +++ b/.github/workflows/linux-bionic-5.9.yml @@ -34,6 +34,8 @@ jobs: - name: build Subsurface run: | cd .. + git config --global --add safe.directory /__w/subsurface/subsurface + git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer bash -x subsurface/scripts/build.sh -desktop -build-with-webkit - name: test desktop build diff --git a/.github/workflows/linux-focal-5.12.yml b/.github/workflows/linux-focal-5.12.yml index e96828b19..099be6371 100644 --- a/.github/workflows/linux-focal-5.12.yml +++ b/.github/workflows/linux-focal-5.12.yml @@ -41,6 +41,8 @@ jobs: echo "building mobile" git config --global user.email "ci@subsurface-divelog.org" git config --global user.name "Subsurface CI" + git config --global --add safe.directory /__w/subsurface/subsurface + git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer cd .. bash -e -x subsurface/scripts/build.sh -mobile diff --git a/.github/workflows/linux-impish-5.15.yml b/.github/workflows/linux-impish-5.15.yml index b62386c6c..afc16f60c 100644 --- a/.github/workflows/linux-impish-5.15.yml +++ b/.github/workflows/linux-impish-5.15.yml @@ -41,6 +41,8 @@ jobs: echo "building mobile" git config --global user.email "ci@subsurface-divelog.org" git config --global user.name "Subsurface CI" + git config --global --add safe.directory /__w/subsurface/subsurface + git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer cd .. bash -e -x subsurface/scripts/build.sh -mobile