mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: consistently mark git directories safe

Browse source 
Even on platforms that don't have the new git version, yet.
And using the convoluted way to create an environment variable that should
point to our checked out tree in the GitHub Action. The more obvious ways
have resulted in failed builds for obscure reasons.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2022-05-13 11:33:05 -07:00
parent 8ead205c8c
commit c1e7cd1428
11 changed files with 46 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/android.yml vendored
View file

@ -18,6 +18,8 @@ jobs:
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: run build - name: run build
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
# this is rather awkward, but it allows us to use the preinstalled # this is rather awkward, but it allows us to use the preinstalled
# Android and Qt versions with relative paths # Android and Qt versions with relative paths
@ -35,5 +37,7 @@ jobs:
# it turns out our build container doesn't have a native compiler # it turns out our build container doesn't have a native compiler
# yet ECM needs that # yet ECM needs that
apt-get install --reinstall cpp-7 gcc-7-base libgcc-7-dev libcc1-0 gcc-7 apt-get install --reinstall cpp-7 gcc-7-base libgcc-7-dev libcc1-0 gcc-7
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
bash -x ./subsurface/packaging/android/qmake-build.sh bash -x ./subsurface/packaging/android/qmake-build.sh

4
.github/workflows/codeql-analysis.yml vendored
View file

@ -60,8 +60,12 @@ jobs:
# queries: ./path/to/local/query, your-org/your-repo/queries@main # queries: ./path/to/local/query, your-org/your-repo/queries@main
- name: Build - name: Build
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
cd .. cd ..
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit bash -e -x subsurface/scripts/build.sh -desktop -build-with-webkit
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis

6
.github/workflows/coverity-scan.yml vendored
View file

@ -38,10 +38,12 @@ jobs:
TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }} TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
- name: run build - name: run build
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
cd .. cd ..
git config --global --add safe.directory /__w/subsurface/subsurface git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
export PATH=`pwd`/cov-analysis-linux64/bin:$PATH export PATH=`pwd`/cov-analysis-linux64/bin:$PATH
cov-build --dir cov-int bash -x subsurface/scripts/build.sh -desktop -build-with-webkit cov-build --dir cov-int bash -x subsurface/scripts/build.sh -desktop -build-with-webkit

6
.github/workflows/ios.yml vendored
View file

@ -24,8 +24,12 @@ jobs:
mkdir -p $HOME/Qt mkdir -p $HOME/Qt
xzcat Qt-5.14.1-ios.tar.xz | tar -x -C $HOME/Qt -f - xzcat Qt-5.14.1-ios.tar.xz | tar -x -C $HOME/Qt -f -
- name: build Subsurface-mobile for iOS - name: build Subsurface-mobile for iOS
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
cd $GITHUB_WORKSPACE/.. cd ${SUBSURFACE_REPO_PATH}/..
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
ln -s $HOME/Qt Qt ln -s $HOME/Qt Qt
echo "build for simulator" echo "build for simulator"
bash -x $GITHUB_WORKSPACE/packaging/ios/build.sh -simulator bash -x $GITHUB_WORKSPACE/packaging/ios/build.sh -simulator

6
.github/workflows/linux-bionic-5.9.yml vendored
View file

@ -32,10 +32,12 @@ jobs:
qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
- name: build Subsurface - name: build Subsurface
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
cd .. cd ..
git config --global --add safe.directory /__w/subsurface/subsurface git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
bash -x subsurface/scripts/build.sh -desktop -build-with-webkit bash -x subsurface/scripts/build.sh -desktop -build-with-webkit
- name: test desktop build - name: test desktop build

9
.github/workflows/linux-fedora-qt6.yml vendored
View file

@ -34,16 +34,17 @@ jobs:
xorg-x11-server-Xvfb xorg-x11-server-Xvfb
- name: build Subsurface - name: build Subsurface
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
echo "--------------------------------------------------------------" echo "--------------------------------------------------------------"
echo "building desktop" echo "building desktop"
# now build for the desktop version (without WebKit) # now build for the desktop version (without WebKit)
git reset --hard
cd .. cd ..
git config --global --add safe.directory /__w/subsurface/subsurface git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
ls -l . subsurface subsurface/scripts git config --global --get-all safe.directory
bash -e -x subsurface/scripts/build.sh -desktop -build-with-qt6 bash -e -x subsurface/scripts/build.sh -desktop -build-with-qt6
- name: test desktop build - name: test desktop build

6
.github/workflows/linux-focal-5.12.yml vendored
View file

@ -36,13 +36,15 @@ jobs:
qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
- name: build Subsurface-mobile - name: build Subsurface-mobile
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
echo "--------------------------------------------------------------" echo "--------------------------------------------------------------"
echo "building mobile" echo "building mobile"
git config --global user.email "ci@subsurface-divelog.org" git config --global user.email "ci@subsurface-divelog.org"
git config --global user.name "Subsurface CI" git config --global user.name "Subsurface CI"
git config --global --add safe.directory /__w/subsurface/subsurface git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
cd .. cd ..
bash -e -x subsurface/scripts/build.sh -mobile bash -e -x subsurface/scripts/build.sh -mobile

6
.github/workflows/linux-impish-5.15.yml vendored
View file

@ -36,13 +36,15 @@ jobs:
qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev qtquickcontrols2-5-dev xvfb libbluetooth-dev libmtp-dev
- name: build Subsurface-mobile - name: build Subsurface-mobile
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
echo "--------------------------------------------------------------" echo "--------------------------------------------------------------"
echo "building mobile" echo "building mobile"
git config --global user.email "ci@subsurface-divelog.org" git config --global user.email "ci@subsurface-divelog.org"
git config --global user.name "Subsurface CI" git config --global user.name "Subsurface CI"
git config --global --add safe.directory /__w/subsurface/subsurface git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory /__w/subsurface/subsurface/libdivecomputer git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
cd .. cd ..
bash -e -x subsurface/scripts/build.sh -mobile bash -e -x subsurface/scripts/build.sh -mobile

4
.github/workflows/linux-trusty-5.12.yml vendored
View file

@ -18,8 +18,12 @@ jobs:
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: run build - name: run build
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
cd .. cd ..
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
rm -rf /install-root/include/libdivecomputer rm -rf /install-root/include/libdivecomputer
bash -x subsurface/.github/workflows/scripts/linux-in-container-build.sh bash -x subsurface/.github/workflows/scripts/linux-in-container-build.sh

4
.github/workflows/mac.yml vendored
View file

@ -21,6 +21,8 @@ jobs:
curl --output Qt-5.13.0-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.13.0-mac.tar.xz curl --output Qt-5.13.0-mac.tar.xz https://f002.backblazeb2.com/file/Subsurface-Travis/Qt-5.13.0-mac.tar.xz
tar -xJ -C Qt/5.13.0 -f Qt-5.13.0-mac.tar.xz tar -xJ -C Qt/5.13.0 -f Qt-5.13.0-mac.tar.xz
- name: build Subsurface-mobile - name: build Subsurface-mobile
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
cd ${GITHUB_WORKSPACE}/.. cd ${GITHUB_WORKSPACE}/..
export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64 export QT_ROOT=${GITHUB_WORKSPACE}/Qt/5.13.0/clang_64
@ -30,6 +32,8 @@ jobs:
DIR=$(pwd) DIR=$(pwd)
git config --global user.email "ci@subsurface-divelog.org" git config --global user.email "ci@subsurface-divelog.org"
git config --global user.name "Subsurface CI" git config --global user.name "Subsurface CI"
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
# first build Subsurface-mobile to ensure this didn't get broken # first build Subsurface-mobile to ensure this didn't get broken
bash -e -x ./subsurface/scripts/build.sh -mobile bash -e -x ./subsurface/scripts/build.sh -mobile

4
.github/workflows/windows.yml vendored
View file

@ -18,8 +18,12 @@ jobs:
uses: actions/checkout@v1 uses: actions/checkout@v1
- name: get other dependencies - name: get other dependencies
env:
SUBSURFACE_REPO_PATH: ${{ github.workspace }}
run: | run: |
echo "Running script to install additional dependancies into container" echo "Running script to install additional dependancies into container"
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}
git config --global --add safe.directory ${SUBSURFACE_REPO_PATH}/libdivecomputer
cd /win cd /win
ln -s /__w/subsurface/subsurface . ln -s /__w/subsurface/subsurface .
bash -x subsurface/.github/workflows/scripts/windows-container-prep.sh 2>&1 | tee pre-build.log bash -x subsurface/.github/workflows/scripts/windows-container-prep.sh 2>&1 | tee pre-build.log