From 51b956ac7fc835a97a783b93e5be749de74f6a87 Mon Sep 17 00:00:00 2001 From: Samuel <36420837+Samueru-sama@users.noreply.github.com> Date: Sun, 6 Oct 2024 15:14:04 -0400 Subject: [PATCH] infra: don't repackage appimages and fix zsync files (#34) Co-authored-by: reggie --- .github/workflows/build.yml | 10 +++-- .github/workflows/release.yml | 42 ++++++++++++------- distribution/linux/appimage/build-appimage.sh | 9 ++-- 3 files changed, 37 insertions(+), 24 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4d5c3765..b4bfc647 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -82,7 +82,7 @@ jobs: - name: Build AppImage if: github.event_name == 'pull_request' && matrix.platform.os == 'ubuntu-latest' run: | - PLATFORM_NAME="${{ matrix.platform.name }}" + ARCH_NAME="${RUNNER_ARCH,,}" sudo apt install -y zsync desktop-file-utils appstream @@ -93,15 +93,17 @@ jobs: wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" chmod +x tools/appimagetool - if [ "$PLATFORM_NAME" = "linux-x64" ]; then + # Explicitly set $ARCH for appimagetool + if [ "$ARCH_NAME" = "x64" ]; then export ARCH=x86_64 - elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then + elif [ "$ARCH_NAME" = "arm64" ]; then export ARCH=aarch64 else - echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME"" + echo "Unexpected ARCH_NAME "$ARCH_NAME"" exit 1 fi + export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync" BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh shell: bash diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 69a8c927..5acc28de 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -106,21 +106,25 @@ jobs: - name: Packing Windows builds if: matrix.platform.os == 'windows-latest' run: | + BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" + ZIP_OS_NAME="${{ matrix.platform.zip_os_name }}" + pushd publish_ava cp Ryujinx.exe Ryujinx.Ava.exe - 7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip * - 7z a ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip * + 7z a ../release_output/ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.zip * + 7z a ../release_output/test-ava-ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.zip * popd pushd publish_sdl2_headless - 7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip * + 7z a ../release_output/sdl2-ryujinx-headless-$BUILD_VERSION-$ZIP_OS_NAME.zip * popd shell: bash - name: Build AppImage (Linux) if: matrix.platform.os == 'ubuntu-latest' run: | - PLATFORM_NAME="${{ matrix.platform.name }}" + BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" + ARCH_NAME="${RUNNER_ARCH,,}" sudo apt install -y zsync desktop-file-utils appstream @@ -131,36 +135,42 @@ jobs: wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" chmod +x tools/appimagetool - if [ "$PLATFORM_NAME" = "linux-x64" ]; then + # Explicitly set $ARCH for appimagetool + if [ "$ARCH_NAME" = "x64" ]; then export ARCH=x86_64 - elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then + elif [ "$ARCH_NAME" = "arm64" ]; then export ARCH=aarch64 else - echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME"" + echo "Unexpected ARCH_NAME "$ARCH_NAME"" exit 1 fi + export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync" BUILDDIR=publish_ava OUTDIR=publish_ava_appimage distribution/linux/appimage/build-appimage.sh + + # Add to release output + pushd publish_ava_appimage + mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage + mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync + popd shell: bash - name: Packing Linux builds if: matrix.platform.os == 'ubuntu-latest' run: | + BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" + ZIP_OS_NAME="${{ matrix.platform.zip_os_name }}" + pushd publish_ava cp Ryujinx Ryujinx.Ava chmod +x Ryujinx.sh Ryujinx Ryujinx.Ava - tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz * - tar -czvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz * + tar -czvf ../release_output/ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.tar.gz * + tar -czvf ../release_output/test-ava-ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.tar.gz * popd pushd publish_sdl2_headless chmod +x Ryujinx.sh Ryujinx.Headless.SDL2 - tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz * - popd - - # AppImage archive - pushd publish_ava_appimage - tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}-AppImage.tar.gz * + tar -czvf ../release_output/sdl2-ryujinx-headless-$BUILD_VERSION-$ZIP_OS_NAME.tar.gz * popd shell: bash @@ -169,7 +179,7 @@ jobs: with: name: ${{ steps.version_info.outputs.build_version }} tag: ${{ steps.version_info.outputs.build_version }} - artifacts: "release_output/*.tar.gz,release_output/*.zip" + artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*" draft: "true" omitBody: true #omitBodyDuringUpdate: true diff --git a/distribution/linux/appimage/build-appimage.sh b/distribution/linux/appimage/build-appimage.sh index 5cb4db65..2f34f8ad 100755 --- a/distribution/linux/appimage/build-appimage.sh +++ b/distribution/linux/appimage/build-appimage.sh @@ -1,14 +1,15 @@ #!/bin/sh -set -e +set -eu ROOTDIR="$(readlink -f "$(dirname "$0")")"/../../../ cd "$ROOTDIR" BUILDDIR=${BUILDDIR:-publish} OUTDIR=${OUTDIR:-publish_appimage} +UFLAG=${UFLAG:-"gh-releases-zsync|ryujinx-mirror|ryujinx|latest|*-x64.AppImage.zsync"} rm -rf AppDir -mkdir -p AppDir/usr/bin/bin +mkdir -p AppDir/usr/bin cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop cp distribution/linux/appimage/AppRun AppDir/AppRun @@ -22,8 +23,8 @@ chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx* mkdir -p "$OUTDIR" appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \ - -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|Ryujinx|latest|*.AppImage.zsync" \ + -u "$UFLAG" \ AppDir "$OUTDIR"/Ryujinx.AppImage -# ?? +# Move zsync file needed for delta updates mv ./*.AppImage.zsync "$OUTDIR"