Skip to content

Commit

Permalink
Merge commit 'ac9bcabd9c2e6095a3298eedc6d9e2eda704e25d' into feature-…
Browse files Browse the repository at this point in the history
…clean
  • Loading branch information
DIDIRUS4 committed Oct 3, 2024
2 parents 14f2fb7 + ac9bcab commit 425aa36
Show file tree
Hide file tree
Showing 36 changed files with 4,960 additions and 6,939 deletions.
9 changes: 2 additions & 7 deletions .github/workflows/app-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,6 @@ jobs:
with:
components: rustfmt, clippy

- name: Install Tauri CLI
run: cargo install tauri-cli --git https://github.com/modrinth/tauri.git --rev 5e2942876c2266594ed1db516c1d9975c873c36a

- name: Setup rust cache
uses: actions/cache@v4
with:
Expand All @@ -66,7 +63,7 @@ jobs:
!target/release/bundle/msi/*.msi
!target/release/bundle/msi/*.msi.zip
!target/release/bundle/msi/*.msi.zip.sig
!target/release/bundle/nsis/*.exe
!target/release/bundle/nsis/*.nsis.zip
!target/release/bundle/nsis/*.nsis.zip.sig
Expand Down Expand Up @@ -115,7 +112,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
V1_COMPATIBLE_BIN_NAME: true

- name: build app
run: pnpm --filter=@modrinth/app run tauri build --config "tauri-release.conf.json"
Expand All @@ -125,7 +121,6 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_PRIVATE_KEY }}
TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_KEY_PASSWORD }}
V1_COMPATIBLE_BIN_NAME: true

- name: upload ${{ matrix.platform }}
uses: actions/upload-artifact@v4
Expand All @@ -148,7 +143,7 @@ jobs:
target/release/bundle/msi/*.msi
target/release/bundle/msi/*.msi.zip
target/release/bundle/msi/*.msi.zip.sig
target/release/bundle/nsis/*.exe
target/release/bundle/nsis/*.nsis.zip
target/release/bundle/nsis/*.nsis.zip.sig
Loading

0 comments on commit 425aa36

Please sign in to comment.