Skip to content

Fix Flatpak builds reporting as dev builds without licensing #216

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

Draft
nbolton wants to merge 1 commit into
base: beta
Choose a base branch
from
Draft

Fix Flatpak builds reporting as dev builds without licensing #216

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
12 changes: 12 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,18 @@ jobs:

- run: git config --global protocol.file.allow always

# flatpak-builder can't take cmake args, so the build's version flags live
# in the manifest. Flip them to match the event; fail loudly if they ever
# go missing rather than silently shipping a dev build.
- name: Set version flags
run: |
manifest=extra/deploy/linux/flatpak/com.symless.synergy.yml
grep -q -- '-DSYNERGY_VERSION_RELEASE=' "$manifest" \
&& grep -q -- '-DSYNERGY_VERSION_SNAPSHOT=' "$manifest" \
|| { echo "::error::version flags missing from $manifest"; exit 1; }
sed -i "s|-DSYNERGY_VERSION_RELEASE=[a-zA-Z]*|-DSYNERGY_VERSION_RELEASE=$SYNERGY_VERSION_RELEASE|" "$manifest"
sed -i "s|-DSYNERGY_VERSION_SNAPSHOT=[a-zA-Z]*|-DSYNERGY_VERSION_SNAPSHOT=$SYNERGY_VERSION_SNAPSHOT|" "$manifest"

- name: Lint appsteam
run: flatpak-builder-lint appstream extra/deploy/linux/com.symless.synergy.metainfo.xml

Expand Down
3 changes: 3 additions & 0 deletions extra/deploy/linux/flatpak/com.symless.synergy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ modules:
buildsystem: cmake-ninja
config-opts:
- "-DCMAKE_BUILD_TYPE=Release"
# Dev build by default; CI overwrites these for snapshot/release flatpaks.
- "-DSYNERGY_VERSION_RELEASE=false"
- "-DSYNERGY_VERSION_SNAPSHOT=false"
sources:
- type: dir
path: ../../../../
Loading