From cb2f17584b90f4a736576011b06c997c12bc4b10 Mon Sep 17 00:00:00 2001 From: Jeff Gardner <202880+erskingardner@users.noreply.github.com> Date: Mon, 6 Jan 2025 08:08:41 -0600 Subject: [PATCH] Update mac signing again --- .github/workflows/build.yml | 22 ++++++++-------------- .github/workflows/release.yml | 10 ++++++++++ 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2357808..37fada9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -160,7 +160,7 @@ jobs: run: | find src-tauri/gen/android/app/build/outputs/apk/*/release/*.apk -type f find src-tauri/gen/android/app/build/outputs/bundle/universalRelease/*.aab -type f - + # Add this before the artifact upload steps - name: Generate artifact hashes if: matrix.android @@ -174,7 +174,7 @@ jobs: find . -type f -name "*.aab" -exec sh -c ' sha256sum "$1" > "${1}.sha256" ' sh {} \; - + - name: Generate desktop artifact hashes if: ${{ !matrix.android }} run: | @@ -185,13 +185,15 @@ jobs: sha256sum "$1" > "${1}.sha256" ' sh {} \; elif [ "${{ matrix.platform }}" = "macos-latest" ]; then - cd src-tauri/target/release/bundle + cd src-tauri/target/aarch64-apple-darwin/release/bundle # Generate hash for macOS app bundle cd macos find . -type f -name "*.app" -exec sh -c ' shasum -a 256 "$1" > "${1}.sha256" ' sh {} \; - + find . -type f -name "*.app.tar.gz" -exec sh -c ' + shasum -a 256 "$1" > "${1}.sha256" + ' sh {} \; # Generate hash for DMG cd ../dmg find . -type f -name "*.dmg" -exec sh -c ' @@ -217,13 +219,5 @@ jobs: with: name: desktop-artifacts-${{ matrix.platform }}${{ matrix.args && '-' }}${{ matrix.args }} path: | - src-tauri/target/release/bundle/deb/*.deb - src-tauri/target/release/bundle/deb/*.deb.sha256 - src-tauri/target/release/bundle/rpm/*.rpm - src-tauri/target/release/bundle/rpm/*.rpm.sha256 - src-tauri/target/release/bundle/appimage/*.AppImage - src-tauri/target/release/bundle/appimage/*.AppImage.sha256 - src-tauri/target/release/bundle/dmg/*.dmg - src-tauri/target/release/bundle/dmg/*.dmg.sha256 - src-tauri/target/release/bundle/macos/*.app - src-tauri/target/release/bundle/macos/*.app.sha256 + src-tauri/target/**/release/bundle/**/*.{deb,rpm,AppImage,dmg,app,app.tar.gz} + src-tauri/target/**/release/bundle/**/*.sha256 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ba2ef17..9fa8e7a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,6 +13,14 @@ jobs: needs: build runs-on: ubuntu-latest steps: + - name: Download artifacts + uses: actions/download-artifact@v3 + with: + path: artifacts + + - name: Display structure of downloaded files + run: ls -R artifacts + - name: Create Release uses: softprops/action-gh-release@v1 env: @@ -23,3 +31,5 @@ jobs: name: ${{ github.ref_name }} tag_name: ${{ github.ref_name }} body: "See the assets to download this version and install." + files: | + artifacts/**/*