Skip to content

Commit

Permalink
Fix version number in pkg2appimage
Browse files Browse the repository at this point in the history
  • Loading branch information
sbernhard committed Jan 28, 2025
1 parent c33162a commit 0075b60
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 3 deletions.
13 changes: 12 additions & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 1

- name: Print configuration
run: echo "Running build on ${{ matrix.config }}"
Expand All @@ -35,7 +37,16 @@ jobs:
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
apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc git
echo "current dir"
pwd
echo "list all"
ls -la
echo "Github workspace is: $GITHUB_WORKSPACE"
echo "set github ws"
git config --global --add safe.directory "$GITHUB_WORKSPACE"
echo "current config"
git config -l
- name: Build pkg2appimage
run: |
Expand Down
2 changes: 1 addition & 1 deletion README.md
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
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
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

0 comments on commit 0075b60

Please sign in to comment.