Skip to content

Commit 085e4ef

Browse files
committed
Add release zsync update files to continuous
As there will be releases 1.7.1, 1.7.2 etc., storing zsync in release asset doesn't make sense (further version won't update previous update information). Thus store this in continuous release assets - update channel "release" was introduced aside to existing "continuous".
1 parent 577986b commit 085e4ef

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/scripts/environment.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
if expr $GITHUB_REF : 'refs/heads/release/'; then
44
VERSION=${GITHUB_REF#refs/heads/release/}
55
TAG=v$VERSION
6+
CHANNEL=release
67
elif [ $GITHUB_REF = 'refs/heads/ndi-build' ]; then
78
VERSION=ndi
89
TAG=$VERSION
@@ -11,7 +12,12 @@ else
1112
TAG=$VERSION
1213
fi
1314

14-
export VERSION TAG
15+
if [ -z ${CHANNEL-""} ]; then
16+
CHANNEL=$VERSION
17+
fi
1518

16-
echo "VERSION=$VERSION" >> $GITHUB_ENV
19+
export CHANNEL TAG VERSION
20+
21+
echo "CHANNEL=$CHANNEL" >> $GITHUB_ENV
1722
echo "TAG=$TAG" >> $GITHUB_ENV
23+
echo "VERSION=$VERSION" >> $GITHUB_ENV

.github/workflows/ccpp.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ jobs:
100100
- name: check libc/libstdc++ ABI
101101
run: .github/scripts/Linux/check_abi.sh 2.27 3.4.22 1.3.9 bin/* lib/ultragrid/*
102102
- name: Create AppImage
103-
run: APPIMAGE=`data/scripts/Linux-AppImage/create-appimage.sh https://github.com/$GITHUB_REPOSITORY/releases/download/$TAG/UltraGrid-$VERSION-x86_64.AppImage.zsync` && mv $APPIMAGE UltraGrid-$VERSION-x86_64.AppImage
103+
run: APPIMAGE=`data/scripts/Linux-AppImage/create-appimage.sh https://github.com/$GITHUB_REPOSITORY/releases/download/continuous/UltraGrid-$CHANNEL-x86_64.AppImage.zsync` && mv $APPIMAGE UltraGrid-$VERSION-x86_64.AppImage
104104
- name: Check AppImage
105105
run: |
106106
docker build -f .github/scripts/Linux/utils/Dockerfile.ubuntu -t aitest-ubuntu .
@@ -124,8 +124,8 @@ jobs:
124124
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
125125
run: |
126126
sudo apt install jq zsync
127-
zsyncmake -C UltraGrid-$VERSION-x86_64.AppImage
128-
.github/scripts/replace-asset.sh $TAG UltraGrid-$VERSION-x86_64.AppImage.zsync application/x-zsync AppImage%20zsync
127+
zsyncmake -C -u https://github.com/$GITHUB_REPOSITORY/releases/download/$TAG/UltraGrid-$VERSION-x86_64.AppImage -o UltraGrid-$CHANNEL-x86_64.AppImage.zsync UltraGrid-$VERSION-x86_64.AppImage
128+
.github/scripts/replace-asset.sh continuous UltraGrid-$CHANNEL-x86_64.AppImage.zsync application/x-zsync AppImage%20${CHANNEL}%20zsync
129129
.github/scripts/replace-asset.sh $TAG UltraGrid-$VERSION-x86_64.AppImage application/x-appimage Linux%20build
130130
- name: Upload Build
131131
if: steps.upload-ndi.conclusion == 'skipped' && steps.upload-release.conclusion == 'skipped'

0 commit comments

Comments
 (0)