Skip to content

Commit 28ddf10

Browse files
committed
Fix version number in pkg2appimage
1 parent c33162a commit 28ddf10

File tree

4 files changed

+24
-8
lines changed

4 files changed

+24
-8
lines changed

.github/workflows/build.yml

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,29 @@ jobs:
2525
image: ${{ matrix.config.image }}
2626
options: --privileged
2727
steps:
28+
- name: Install dependencies
29+
run: |
30+
export DEBIAN_FRONTEND="noninteractive"
31+
apt-get update
32+
apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc git
33+
echo "current dir"
34+
pwd
35+
echo "list all"
36+
ls -la
37+
echo "Github workspace is: $GITHUB_WORKSPACE"
38+
echo "set github ws"
39+
git config --global --add safe.directory "$GITHUB_WORKSPACE"
40+
echo "current config"
41+
git config -l
42+
2843
- name: Checkout code
2944
uses: actions/checkout@v4
45+
with:
46+
fetch-depth: 1
3047

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

34-
- name: Install dependencies
35-
run: |
36-
export DEBIAN_FRONTEND="noninteractive"
37-
apt-get update
38-
apt-get install -y sudo libarchive-tools curl zsync squashfs-tools aria2 desktop-file-utils wget fuse binutils file imagemagick gcc
39-
4051
- name: Build pkg2appimage
4152
run: |
4253
bash -ex dogfeeding.sh

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 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)
1+
# 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)
22

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

dogfeeding.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44

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

7+
GIT_SHORT_REV=$(git rev-parse --short HEAD)
8+
echo "Using git short revision: $GIT_SHORT_REV"
9+
710
. ./functions.sh
811

912
mkdir -p build/
@@ -50,4 +53,4 @@ delete_blacklisted
5053
rm usr/lib/*-gnu/liblzma.so.5
5154

5255
cd ..
53-
NO_GLIBC_VERSION=true APP=pkg2appimage VERSION=$(git rev-parse --short HEAD) generate_type2_appimage # FIXME: This embeds bintray-zsync
56+
NO_GLIBC_VERSION=true APP=pkg2appimage VERSION=$GIT_SHORT_REV generate_type2_appimage # FIXME: This embeds bintray-zsync

functions.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,8 @@ generate_type2_appimage()
252252

253253
set +x
254254

255+
echo "Using version $VERSION_EXPANDED for pkg2appimage"
256+
255257
GLIBC_NEEDED=$(glibc_needed)
256258
_APP_DIR="${PWD}/$APP.AppDir/"
257259
export OWD="${PWD}"

0 commit comments

Comments
 (0)