Skip to content

Fix version number issue #566 in pkg2appimage #567

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

Merged
probonopd merged 1 commit into from
Feb 2, 2025
Merged

Fix version number issue #566 in pkg2appimage #567

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
15 changes: 9 additions & 6 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,21 @@ jobs:
image: ${{ matrix.config.image }}
options: --privileged
steps:
- name: Install dependencies
run: |
export DEBIAN_FRONTEND="noninteractive"
apt-get update
apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc git
git config --global --add safe.directory "$GITHUB_WORKSPACE"
Copy link
Member

@probonopd probonopd Feb 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this needed?

Copy link
Contributor Author

@sbernhard sbernhard Feb 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, this is essential to have the version.
See actions/checkout#363 (comment)

Copy link
Member

@probonopd probonopd Feb 2, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's THIS that I was missing in my earlier attempts then. Thanks!


- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Print configuration
run: echo "Running build on ${{ matrix.config }}"

- name: Install dependencies
run: |
export DEBIAN_FRONTEND="noninteractive"
apt-get update
apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc

- name: Build pkg2appimage
run: |
bash -ex dogfeeding.sh
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# pkg2appimage [![Build Status](https://travis-ci.org/AppImage/pkg2appimage.svg)](https://travis-ci.org/AppImage/pkg2appimage) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZT9CL8M5TJU72)
# pkg2appimage [![Build Status](https://github.com/AppImageCommunity/pkg2appimage/actions/workflows/build.yml/badge.svg)](https://github.com/AppImageCommunity/pkg2appimage/actions/workflows/build.yml) [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=ZT9CL8M5TJU72)

[Download as an AppImage](../../releases/tag/continuous)

Expand Down
5 changes: 4 additions & 1 deletion dogfeeding.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@

HERE="$(dirname "$(readlink -f "${0}")")"

GIT_SHORT_REV=$(git rev-parse --short HEAD)
echo "Using git short revision: $GIT_SHORT_REV"

. ./functions.sh

mkdir -p build/
Expand Down Expand Up @@ -50,4 +53,4 @@ delete_blacklisted
rm usr/lib/*-gnu/liblzma.so.5

cd ..
NO_GLIBC_VERSION=true APP=pkg2appimage VERSION=$(git rev-parse --short HEAD) generate_type2_appimage # FIXME: This embeds bintray-zsync
NO_GLIBC_VERSION=true APP=pkg2appimage VERSION=$GIT_SHORT_REV generate_type2_appimage # FIXME: This embeds bintray-zsync
2 changes: 2 additions & 0 deletions functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,8 @@ generate_type2_appimage()

set +x

echo "Using version $VERSION_EXPANDED for pkg2appimage"

GLIBC_NEEDED=$(glibc_needed)
_APP_DIR="${PWD}/$APP.AppDir/"
export OWD="${PWD}"
Expand Down