Skip to content
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

Add correct git version to AppImage #2415

Merged
merged 3 commits into from
Jul 12, 2024
Merged

Add correct git version to AppImage #2415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2c1674
build: add static build target
igaw Jul 12, 2024
53b4661
build: show git version used during configuration
igaw Jul 12, 2024
58d1526
build: fetch complete git history
igaw Jul 12, 2024
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
7 changes: 7 additions & 0 deletions .github/workflows/appimage.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ jobs:
image: ghcr.io/igaw/linux-nvme/debian:latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: fixup permissions
env:
GITHUB_WORKSPACE: ${{ github.workspace }}
run: |
git config --global --add safe.directory "${GITHUB_WORKSPACE}"
- name: build
run: |
scripts/build.sh appimage
Expand Down
3 changes: 2 additions & 1 deletion meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,8 @@ if meson.version().version_compare('>=0.53.0')
}
summary(dep_dict, section: 'Dependencies')
conf_dict = {
'pdc enabled': get_option('pdc-enabled')
'git version': conf.get('GIT_VERSION'),
'pdc enabled': get_option('pdc-enabled'),
}
summary(conf_dict, section: 'Configuration')
endif
11 changes: 11 additions & 0 deletions scripts/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ usage() {
echo " appimage build AppImage target"
echo " distro build libnvme and nvme-cli separately"
echo " docs build documentation"
echo " static build a static binary"
echo ""
echo "configs with muon:"
echo " [default] minimal static build"
Expand Down Expand Up @@ -126,6 +127,16 @@ config_meson_docs() {
"${BUILDDIR}"
}

config_meson_static() {
CC="${CC}" "${MESON}" setup \
--buildtype=release \
--default-library=static \
--wrap-mode=forcefallback \
-Dc_link_args="-static" \
-Dlibnvme:keyutils=disabled \
"${BUILDDIR}"
}

build_meson() {
"${MESON}" compile \
-C "${BUILDDIR}"
Expand Down