diff --git a/.github/workflows/canary.yml b/.github/workflows/canary.yml index 7f11c9039..954bc98b9 100644 --- a/.github/workflows/canary.yml +++ b/.github/workflows/canary.yml @@ -102,12 +102,10 @@ jobs: chmod +x Ryujinx.sh Ryujinx tar -czvf ../release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz ../publish popd - + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/canary --command=UploadGenericPackage "Ryubing-Canary|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz" shell: bash - # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool - - name: Build AppImage (Linux) if: matrix.platform.os == 'ubuntu-latest' run: | diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e1d85f63e..3895b160e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -96,48 +96,46 @@ jobs: shell: bash env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + - name: Build AppImage (Linux) + if: matrix.platform.os == 'ubuntu-latest' + run: | + BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" + PLATFORM_NAME="${{ matrix.platform.name }}" + + sudo apt install -y zsync desktop-file-utils appstream + + mkdir -p tools + export PATH="$PATH:$(readlink -f tools)" + + # Setup appimagetool + wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" + chmod +x tools/appimagetool + chmod +x distribution/linux/appimage/build-appimage.sh + + # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) + if [ "$PLATFORM_NAME" = "linux-x64" ]; then + ARCH_NAME=x64 + export ARCH=x86_64 + elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then + ARCH_NAME=arm64 + export ARCH=aarch64 + else + echo "Unexpected PLATFORM_NAME "$PLATFORM_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 + + pushd publish_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 - # If anyone wants to look into why appimagetool randomly errors with exit code 8, that would be cool - -# - name: Build AppImage (Linux) -# if: matrix.platform.os == 'ubuntu-latest' -# run: | -# BUILD_VERSION="${{ steps.version_info.outputs.build_version }}" -# PLATFORM_NAME="${{ matrix.platform.name }}" -# -# sudo apt install -y zsync desktop-file-utils appstream -# -# mkdir -p tools -# export PATH="$PATH:$(readlink -f tools)" -# -# # Setup appimagetool -# wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage" -# chmod +x tools/appimagetool -# chmod +x distribution/linux/appimage/build-appimage.sh -# -# # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name) -# if [ "$PLATFORM_NAME" = "linux-x64" ]; then -# ARCH_NAME=x64 -# export ARCH=x86_64 -# elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then -# ARCH_NAME=arm64 -# export ARCH=aarch64 -# else -# echo "Unexpected PLATFORM_NAME "$PLATFORM_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 -# -# pushd publish_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 -# -# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage" -# gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync" -# shell: bash + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage" + gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=UploadGenericPackage "Ryubing|${{ steps.version_info.outputs.build_version }}|release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync" + shell: bash macos_release: name: Release MacOS universal