diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index a76b1e284..858d7bf42 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -4,7 +4,6 @@ on: push: branches: - calamares - - 3.2.x-stable pull_request: types: - opened @@ -20,6 +19,7 @@ env: -DKDE_INSTALL_USE_QT_SYS_PATHS=ON -DWITH_PYTHONQT=OFF -DCMAKE_BUILD_TYPE=Debug + GIT_HASH: ${{ github.event.head_commit.id }} jobs: build: @@ -34,5 +34,5 @@ jobs: shell: bash run: ./ci/deps-neon.sh - name: "build" - id: build - uses: calamares/actions/generic-build@v4 + shell: bash + run: ./ci/build.sh diff --git a/ci/build.sh b/ci/build.sh new file mode 100755 index 000000000..3e8289b94 --- /dev/null +++ b/ci/build.sh @@ -0,0 +1,20 @@ +#! /bin/sh +# +# Generic build (driven by environment variables) +# + +# Sanity check +test -n "$BUILDDIR" || { echo "! \$BUILDDIR not set" ; exit 1 ; } +mkdir -p "$BUILDDIR" +test -f "$SRCDIR/CMakeLists.txt" || { echo "! Missing $SRCDIR/CMakeLists.txt" ; exit 1 ; } + +BUILD_MESSAGE="No commit info" +test -n "$GIT_HASH" && BUILD_MESSAGE=$( git log -1 --abbrev-commit --pretty=oneline --no-decorate "$GIT_HASH" ) + +echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::" + +cmake -S "$SRCDIR" -B "$BUILDDIR" $CMAKE_ARGS || exit 1 +make -C "$BUILDDIR" -j2 VERBOSE=1 || exit 1 +make -C "$BUILDDIR" install VERBOSE=1 || exit 1 + +echo "::" ; echo ":: $BUILD_MESSAGE" ; echo "::"