diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 03a7f989..f7b37917 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -67,10 +67,12 @@ jobs: projectPath: packages/desktop args: --target ${{ matrix.tauri_target }} - - run: | + - name: Clean up file names + run: | mkdir tmp - for f in ${{ join(fromJSON(steps.tauri.outputs.artifactPaths), ' ') }}; do - mv "$f" "tmp/tauri.${f##*.}" + ARTIFACTS=$(echo "${{ steps.tauri.outputs.artifactPaths }}" | jq -r '.[]') + for ARTIFACT in ARTIFACTS; do + mv "$ARTIFACT" "tmp/tauri.${ARTIFACT##*.}" done shell: bash diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index f23c05a9..21fca7a7 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -24,7 +24,6 @@ jobs: with: path: tmp pattern: bundle-* - merge-multiple: true - uses: glzr-io/actions/semantic-release@main with: @@ -34,12 +33,24 @@ jobs: gh-assets: | [ { - "path": "artifacts/win-x64/GlazeWM.exe", - "name": "GlazeWM_x64_${nextRelease.gitTag}" + "path": "tmp/x86_64-pc-windows-msvc/tauri.msi", + "name": "Zebar_x64_${nextRelease.gitTag}.msi" }, { - "path": "artifacts/win-x86/GlazeWM.exe", - "name": "GlazeWM_x86_${nextRelease.gitTag}" + "path": "tmp/i686-pc-windows-msvc/tauri.msi", + "name": "Zebar_x86_${nextRelease.gitTag}.msi" + }, + { + "path": "tmp/universal-apple-darwin/tauri.dmg", + "name": "Zebar_${nextRelease.gitTag}.dmg" + }, + { + "path": "tmp/x86_64-unknown-linux-gnu/tauri.deb", + "name": "Zebar_x64_${nextRelease.gitTag}.deb" + }, + { + "path": "tmp/x86_64-unknown-linux-gnu/tauri.AppImage", + "name": "Zebar_x64_${nextRelease.gitTag}.AppImage" } ] npm-publish: true