File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 4545
4646 - name : Configure CMake
4747 run : |
48+ TAG=$(grep "tag:" manifest.yaml | cut -d'"' -f2)
49+ COMMIT=$(grep "short_rev:" manifest.yaml | cut -d'"' -f2)
4850 cmake -S . -B build -G Ninja \
4951 -DCMAKE_BUILD_TYPE=Release \
50- -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
52+ -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
53+ -DVICINAE_GIT_TAG="$TAG" \
54+ -DVICINAE_GIT_COMMIT_HASH="$COMMIT"
5155
5256 - name : Build
5357 run : cmake --build build --parallel $(nproc)
Original file line number Diff line number Diff line change @@ -144,14 +144,16 @@ jobs:
144144
145145 - name : Configure CMake
146146 run : |
147+ TAG=$(grep "tag:" manifest.yaml | cut -d'"' -f2)
148+ COMMIT=$(grep "short_rev:" manifest.yaml | cut -d'"' -f2)
147149 cd build
148150 cmake -G Ninja .. \
149151 -DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
150152 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
151153 -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
152154 -DVICINAE_PROVENANCE=appimage \
153- -DVICINAE_GIT_TAG="${{ needs.build-binary.outputs.tag }}" \
154- -DVICINAE_GIT_COMMIT_HASH="${{ needs.build-binary.outputs.commit }}" \
155+ -DVICINAE_GIT_TAG="$TAG" \
156+ -DVICINAE_GIT_COMMIT_HASH="$COMMIT" \
155157 -DLTO=ON
156158
157159 - name : Build
Original file line number Diff line number Diff line change 11BUILD_DIR := build
22BIN_DIR := build/bin
33RM := rm
4- TAG := $(shell git describe --tags --abbrev=0)
4+ TAG := $(shell grep "tag:" manifest.yaml | cut -d'"' -f2)
5+ COMMIT := $(shell grep "short_rev:" manifest.yaml | cut -d'"' -f2)
56APPIMAGE_BUILD_ENV_DIR := ./scripts/runners/appimage/
67APPIMAGE_BUILD_ENV_IMAGE_TAG := vicinae/appimage-build-env
78FIGURA_CC := $(BIN_DIR ) /figura
@@ -92,7 +93,7 @@ portable:
9293.PHONY : portable
9394
9495appimage :
95- cmake -G Ninja -DCMAKE_INSTALL_PREFIX=./build/install -DVICINAE_PROVENANCE=appimage -B $(BUILD_DIR )
96+ cmake -G Ninja -DCMAKE_INSTALL_PREFIX=./build/install -DVICINAE_PROVENANCE=appimage -DVICINAE_GIT_TAG= " $( TAG ) " -DVICINAE_GIT_COMMIT_HASH= " $( COMMIT ) " - B $(BUILD_DIR )
9697 cmake --build $(BUILD_DIR )
9798 cmake --install $(BUILD_DIR )
9899 ./scripts/mkappimage.sh ./build/install AppDir
You can’t perform that action at this time.
0 commit comments