mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
CICD: Improve Workflows.
Make multiple improvements to the existing workflows: - create a shared custom action to deal with version number tracking and generation; - use this action to add the branch name to the version for pull request builds; - create a shared workflow for all debian-ish builds to avoid re-use by copy / paste; - remove potential security risks by eliminating the use of pre-evaluated expressions (`${{ ... }}`) inside scripts; - update outdated GitHub action versions; - improve the consistency by renaming scripts acording to have a `.sh` extension; - improve naming of generated artefacts for pull requests to include the correct version. @dirkh: Unfortunately this is potentially going to break builds when it is merged, as there is no good way to 'test' a merge build short of merging. We'll just have to deal with the fallout of it in a follow-up pull request. Signed-off-by: Michael Keller <github@ike.ch>
This commit is contained in:
parent
e20ec9248c
commit
6fc8310705
32 changed files with 399 additions and 536 deletions
|
@ -86,9 +86,9 @@ mkdir -p "$BUILDROOT"/subsurface-mobile-build
|
|||
pushd "$BUILDROOT"/subsurface-mobile-build
|
||||
|
||||
# set up the Subsurface versions by hand
|
||||
CANONICALVERSION=$("$SUBSURFACE_SOURCE"/scripts/get-version)
|
||||
CANONICALVERSION=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh)
|
||||
echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" > ssrf-version.h
|
||||
CANONICALVERSION_4=$("$SUBSURFACE_SOURCE"/scripts/get-version 4)
|
||||
CANONICALVERSION_4=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh 4)
|
||||
echo "#define CANONICAL_VERSION_STRING_4 \"$CANONICALVERSION_4\"" >> ssrf-version.h
|
||||
popd
|
||||
|
||||
|
|
|
@ -26,7 +26,7 @@ cd subsurface
|
|||
git submodule init
|
||||
git submodule update
|
||||
|
||||
GITVERSION=$(bash scripts/get-version 4)
|
||||
GITVERSION=$(bash scripts/get-version.sh 4)
|
||||
GITDATE=$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d)
|
||||
LIBDCREVISION=$(cd libdivecomputer ; git rev-parse --verify HEAD)
|
||||
FOLDER="subsurface-$GITVERSION"
|
||||
|
|
|
@ -77,11 +77,11 @@ if [[ $QT_VERSION = 5.15* ]] ; then
|
|||
fi
|
||||
|
||||
# set up the Subsurface versions by hand
|
||||
CANONICALVERSION=$("$SUBSURFACE_SOURCE"/scripts/get-version)
|
||||
CANONICALVERSION=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh)
|
||||
echo "#define CANONICAL_VERSION_STRING \"$CANONICALVERSION\"" > "$SUBSURFACE_SOURCE"/ssrf-version.h
|
||||
CANONICALVERSION_4=$("$SUBSURFACE_SOURCE"/scripts/get-version 4)
|
||||
CANONICALVERSION_4=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh 4)
|
||||
echo "#define CANONICAL_VERSION_STRING_4 \"$CANONICALVERSION_4\"" >> "$SUBSURFACE_SOURCE"/ssrf-version.h
|
||||
CANONICALVERSION_3=$("$SUBSURFACE_SOURCE"/scripts/get-version 3)
|
||||
CANONICALVERSION_3=$("$SUBSURFACE_SOURCE"/scripts/get-version.sh 3)
|
||||
echo "#define CANONICAL_VERSION_STRING_3 \"$CANONICALVERSION_3\"" >> "$SUBSURFACE_SOURCE"/ssrf-version.h
|
||||
|
||||
BUNDLE=org.subsurface-divelog.subsurface-mobile
|
||||
|
|
|
@ -11,7 +11,7 @@ DMGCREATE=create-dmg
|
|||
|
||||
# same git version magic as in the Makefile
|
||||
# for the naming of volume and dmg we want the 3 digits of the full version number
|
||||
VERSION=$(cd ${DIR}/subsurface; ./scripts/get-version)
|
||||
VERSION=$(cd ${DIR}/subsurface; ./scripts/get-version.sh)
|
||||
|
||||
# first build and install Subsurface and then clean up the staging area
|
||||
# make sure we didn't lose the minimum OS version
|
||||
|
|
|
@ -20,7 +20,7 @@ cd subsurface
|
|||
git submodule init
|
||||
git submodule update
|
||||
|
||||
GITVERSION=$(bash scripts/get-version 4)
|
||||
GITVERSION=$(bash scripts/get-version.sh 4)
|
||||
GITDATE=$(git log -1 --format="%at" | xargs -I{} date -d @{} +%Y-%m-%d)
|
||||
LIBDCREVISION=$(cd libdivecomputer ; git rev-parse --verify HEAD)
|
||||
FOLDER="subsurface_$GITVERSION"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue