diff --git a/.forgejo/workflows/macos.yaml b/.forgejo/workflows/macos.yaml index e2decb2a..c5affa30 100644 --- a/.forgejo/workflows/macos.yaml +++ b/.forgejo/workflows/macos.yaml @@ -13,44 +13,18 @@ jobs: with: submodules: recursive - run: mkdir release - - name: Release MacOS x86 - run: | - cargo zigbuild --release --target x86_64-apple-darwin - mv target/x86_64-apple-darwin/release/grim macos/Grim.app/Contents/MacOS - - name: Archive x86 - working-directory: macos - run: | - zip -r grim-${{ inputs.version }}-macos-x86_64.zip Grim.app - mv grim-${{ inputs.version }}-macos-x86_64.zip ../release - - name: Checksum Archive x86 - working-directory: release - run: sha256sum grim-${{ inputs.version }}-macos-x86_64.zip > grim-${{ inputs.version }}-macos-x86_64-sha256sum.txt - - name: Release ARM - run: | - cargo zigbuild --release --target aarch64-apple-darwin - mv target/aarch64-apple-darwin/release/grim macos/Grim.app/Contents/MacOS - - name: Archive ARM - working-directory: macos - run: | - zip -r grim-${{ inputs.version }}-macos-arm.zip Grim.app - mv grim-${{ inputs.version }}-macos-arm.zip ../release - - name: Checksum Archive ARM - working-directory: release - run: sha256sum grim-${{ inputs.version }}-macos-arm.zip > grim-${{ inputs.version }}-macos-arm-sha256sum.txt - name: Release MacOS Universal run: | - rm ~/.cargo/.package-cache - cargo clean cargo zigbuild --release --target universal2-apple-darwin mv target/universal2-apple-darwin/release/grim macos/Grim.app/Contents/MacOS - name: Archive Universal working-directory: macos run: | - zip -r grim-${{ inputs.version }}-macos-universal.zip Grim.app - mv grim-${{ inputs.version }}-macos-universal.zip ../release + zip -r grim-${{ inputs.version }}-macos.zip Grim.app + mv grim-${{ inputs.version }}-macos.zip ../release - name: Checksum Release Universal working-directory: release - run: sha256sum grim-${{ inputs.version }}-macos-universal.zip > grim-${{ inputs.version }}-macos-universal-sha256sum.txt + run: sha256sum grim-${{ inputs.version }}-macos.zip > grim-${{ inputs.version }}-macos-sha256sum.txt - uses: actions/upload-artifact@v4 with: name: release_macos diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index b410830a..facf5a97 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -224,7 +224,5 @@ jobs: release/grim-${{ needs.version.outputs.v }}-android-x86_64.apk release/grim-${{ needs.version.outputs.v }}-linux-arm.AppImage release/grim-${{ needs.version.outputs.v }}-linux-x86_64.AppImage - release/grim-${{ needs.version.outputs.v }}-macos-arm.zip - release/grim-${{ needs.version.outputs.v }}-macos-x86_64.zip - release/grim-${{ needs.version.outputs.v }}-macos-universal.zip + release/grim-${{ needs.version.outputs.v }}-macos.zip release/grim-${{ needs.version.outputs.v }}-win-x86_64.zip \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index af7e722d..49edec2b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,7 +26,5 @@ jobs: grim-${{ github.ref_name }}-android-x86_64.apk grim-${{ github.ref_name }}-linux-arm.AppImage grim-${{ github.ref_name }}-linux-x86_64.AppImage - grim-${{ github.ref_name }}-macos-arm.zip - grim-${{ github.ref_name }}-macos-x86_64.zip - grim-${{ github.ref_name }}-macos-universal.zip + grim-${{ github.ref_name }}-macos.zip grim-${{ github.ref_name }}-win-x86_64.zip \ No newline at end of file