diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-12-03 10:49:15 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-12-17 09:17:54 -0800 |
| commit | 70470ffa453482f359f9270ee7909bb161c0fb86 (patch) | |
| tree | 9a031b48656f0c675e0917b34345252a7c209a36 | |
| parent | a7d6736665e64c2cc08188ead0086f16d92a9a0d (diff) | |
| download | subsurface-70470ffa453482f359f9270ee7909bb161c0fb86.tar.gz | |
build-system: configure git when running GitHub Action
In order to apply the patches for Kirigami, git insists on having
a valid user name and email.
Also, don't build the mobile app when preparing the AppImage. That
build already takes way too long and we test this in a few other
actions.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | .github/workflows/android.yml | 2 | ||||
| -rw-r--r-- | .github/workflows/linux-eoan-5.12.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/linux-groovy-5.14.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/mac.yml | 3 | ||||
| -rw-r--r-- | .github/workflows/scripts/linux-in-container-build.sh | 6 |
5 files changed, 8 insertions, 9 deletions
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0e05b3195..c367bcff1 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -30,5 +30,7 @@ jobs: ln -s /android/platforms . ln -s /android/tools . ls -l + git config --global user.email "ci@subsurface-divelog.org" + git config --global user.name "Subsurface CI" bash -x ./subsurface/packaging/android/qmake-build.sh diff --git a/.github/workflows/linux-eoan-5.12.yml b/.github/workflows/linux-eoan-5.12.yml index 337ffe70f..3cec1cd46 100644 --- a/.github/workflows/linux-eoan-5.12.yml +++ b/.github/workflows/linux-eoan-5.12.yml @@ -39,7 +39,8 @@ jobs: run: | echo "--------------------------------------------------------------" echo "building mobile" - + git config --global user.email "ci@subsurface-divelog.org" + git config --global user.name "Subsurface CI" cd .. bash -e -x subsurface/scripts/build.sh -mobile diff --git a/.github/workflows/linux-groovy-5.14.yml b/.github/workflows/linux-groovy-5.14.yml index ef5f07efc..9d6ee38b1 100644 --- a/.github/workflows/linux-groovy-5.14.yml +++ b/.github/workflows/linux-groovy-5.14.yml @@ -39,7 +39,8 @@ jobs: run: | echo "--------------------------------------------------------------" echo "building mobile" - + git config --global user.email "ci@subsurface-divelog.org" + git config --global user.name "Subsurface CI" cd .. bash -e -x subsurface/scripts/build.sh -mobile diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 512ed76ab..c945d568e 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -28,7 +28,8 @@ jobs: export PATH=$QT_ROOT/bin:$PATH export CMAKE_PREFIX_PATH=$QT_ROOT/lib/cmake DIR=$(pwd) - + git config --global user.email "ci@subsurface-divelog.org" + git config --global user.name "Subsurface CI" # first build Subsurface-mobile to ensure this didn't get broken bash -e -x ./subsurface/scripts/build.sh -mobile diff --git a/.github/workflows/scripts/linux-in-container-build.sh b/.github/workflows/scripts/linux-in-container-build.sh index e2c4a3373..fedf1d6eb 100644 --- a/.github/workflows/scripts/linux-in-container-build.sh +++ b/.github/workflows/scripts/linux-in-container-build.sh @@ -18,12 +18,6 @@ cp -a /appdir /__w/subsurface/ cp -a /install-root /__w/subsurface/ echo "--------------------------------------------------------------" -echo "building mobile" - -# first make sure that no one broke Subsurface-mobile -bash -e -x subsurface/scripts/build.sh -mobile -quick - -echo "--------------------------------------------------------------" echo "building desktop" # now build our AppImage |