Skip to content

fix(build): resolve AppImage version from manifest #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
albertonoys wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(build): resolve AppImage version from manifest #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion .github/workflows/build-appimage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,13 @@ jobs:

- name: Configure CMake
run: |
TAG=$(grep "tag:" manifest.yaml | cut -d'"' -f2)
COMMIT=$(grep "short_rev:" manifest.yaml | cut -d'"' -f2)
cmake -S . -B build -G Ninja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-DVICINAE_GIT_TAG="$TAG" \
-DVICINAE_GIT_COMMIT_HASH="$COMMIT"

- name: Build
run: cmake --build build --parallel $(nproc)
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,14 +144,16 @@ jobs:

- name: Configure CMake
run: |
TAG=$(grep "tag:" manifest.yaml | cut -d'"' -f2)
COMMIT=$(grep "short_rev:" manifest.yaml | cut -d'"' -f2)
cd build
cmake -G Ninja .. \
-DCMAKE_BUILD_TYPE=${BUILD_TYPE} \
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
-DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}" \
-DVICINAE_PROVENANCE=appimage \
-DVICINAE_GIT_TAG="${{ needs.build-binary.outputs.tag }}" \
-DVICINAE_GIT_COMMIT_HASH="${{ needs.build-binary.outputs.commit }}" \
-DVICINAE_GIT_TAG="$TAG" \
-DVICINAE_GIT_COMMIT_HASH="$COMMIT" \
-DLTO=ON

- name: Build
Expand Down
5 changes: 3 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
BUILD_DIR := build
BIN_DIR := build/bin
RM := rm
TAG := $(shell git describe --tags --abbrev=0)
TAG := $(shell grep "tag:" manifest.yaml | cut -d'"' -f2)
COMMIT := $(shell grep "short_rev:" manifest.yaml | cut -d'"' -f2)
APPIMAGE_BUILD_ENV_DIR := ./scripts/runners/appimage/
APPIMAGE_BUILD_ENV_IMAGE_TAG := vicinae/appimage-build-env
FIGURA_CC := $(BIN_DIR)/figura
Expand Down Expand Up @@ -96,7 +97,7 @@ portable:
.PHONY: portable

appimage:
cmake -G Ninja -DCMAKE_INSTALL_PREFIX=./build/install -DVICINAE_PROVENANCE=appimage -B $(BUILD_DIR)
cmake -G Ninja -DCMAKE_INSTALL_PREFIX=./build/install -DVICINAE_PROVENANCE=appimage -DVICINAE_GIT_TAG="$(TAG)" -DVICINAE_GIT_COMMIT_HASH="$(COMMIT)" -B $(BUILD_DIR)
cmake --build $(BUILD_DIR)
cmake --install $(BUILD_DIR)
./scripts/mkappimage.sh ./build/install AppDir
Expand Down