From 628f3ba74f80bca542ae2f4d73a84cefd818952e Mon Sep 17 00:00:00 2001 From: Martin Pulec Date: Tue, 2 Nov 2021 13:52:02 +0100 Subject: [PATCH] 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". --- .github/scripts/environment.sh | 8 +++++++- .github/workflows/ccpp.yml | 6 +++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/scripts/environment.sh b/.github/scripts/environment.sh index c385667d7..9f157fb64 100755 --- a/.github/scripts/environment.sh +++ b/.github/scripts/environment.sh @@ -5,6 +5,7 @@ NDI=--disable-ndi if expr $GITHUB_REF : 'refs/tags/'; then TAG=${GITHUB_REF#refs/tags/} VERSION=${TAG#v} + CHANNEL=release elif [ $GITHUB_REF = 'refs/heads/ndi-build' ]; then NDI=--enable-ndi VERSION=ndi @@ -14,8 +15,13 @@ else TAG=$VERSION fi -export NDI TAG VERSION +if [ -z ${CHANNEL-""} ]; then + CHANNEL=$VERSION +fi +export CHANNEL NDI TAG VERSION + +echo "CHANNEL=$CHANNEL" >> $GITHUB_ENV echo "NDI=$NDI" >> $GITHUB_ENV echo "TAG=$TAG" >> $GITHUB_ENV echo "VERSION=$VERSION" >> $GITHUB_ENV diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 6834f95ce..0d32123a8 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -100,7 +100,7 @@ jobs: - name: check libc/libstdc++ ABI run: .github/scripts/Linux/check_abi.sh 2.27 3.4.22 1.3.9 bin/* lib/ultragrid/* - name: Create AppImage - 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 + 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 - name: Check AppImage run: | docker build -f .github/scripts/Linux/utils/Dockerfile.ubuntu -t aitest-ubuntu . @@ -124,8 +124,8 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | sudo apt install jq zsync - zsyncmake -C -u https://github.com/$GITHUB_REPOSITORY/releases/download/$TAG/UltraGrid-$VERSION-x86_64.AppImage UltraGrid-$VERSION-x86_64.AppImage - .github/scripts/replace-asset.sh $TAG UltraGrid-$VERSION-x86_64.AppImage.zsync application/x-zsync AppImage%20zsync + 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 + .github/scripts/replace-asset.sh continuous UltraGrid-$CHANNEL-x86_64.AppImage.zsync application/x-zsync AppImage%20${CHANNEL}%20zsync .github/scripts/replace-asset.sh $TAG UltraGrid-$VERSION-x86_64.AppImage application/x-appimage Linux%20build - name: Upload Build if: steps.upload-ndi.conclusion == 'skipped' && steps.upload-release.conclusion == 'skipped'