diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index f1cd607..176d4a0 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,4 +1,4 @@ -name: "Build latest" +name: "Build latest commit" on: push: @@ -23,7 +23,6 @@ jobs: - name: ⏬ Install Rust stable uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable - name: ⚡ Set up cargo cache @@ -36,6 +35,7 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ src-tauri/target/ + target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo @@ -52,7 +52,7 @@ jobs: sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - name: 📥 Install Node Dependencies - run: yarn && yarn build + run: yarn - name: 🔨 Build uses: tauri-apps/tauri-action@v0 @@ -60,26 +60,15 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # - name: ⏫ Upload Release Asset - # id: upload-release-asset - # uses: actions/upload-release-asset@v1.0.2 - # env: - # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # with: - # upload_url: ${{ steps.tauri-build.outputs.releaseUploadUrl }} - # asset_path: src-tauri\target\release\deps\soundcoremanager.exe - # asset_name: SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe - # asset_content_type: application/vnd.microsoft.portable-executable. - - name: Rename soundcoremanager.exe if: matrix.platform == 'windows-latest' - run: ren src-tauri\target\release\deps\soundcoremanager.exe SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe + run: ren target\release\deps\soundcoremanager.exe SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe - name: ⏫ Upload Build Artifact if: matrix.platform == 'windows-latest' uses: actions/upload-artifact@v3 with: name: SoundcoreManager-${{ matrix.platform }}.exe - path: src-tauri\target\release\deps\SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe + path: target\release\deps\SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index b530c49..1018497 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -23,7 +23,6 @@ jobs: - name: ⏬ Install Rust stable uses: dtolnay/rust-toolchain@stable with: - profile: minimal toolchain: stable - name: ⚡ Set up cargo cache @@ -36,6 +35,7 @@ jobs: ~/.cargo/registry/cache/ ~/.cargo/git/db/ src-tauri/target/ + target/ key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} restore-keys: ${{ runner.os }}-cargo @@ -52,7 +52,7 @@ jobs: sudo apt-get install -y libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf - name: 📥 Install Node Dependencies - run: yarn && yarn build + run: yarn install --frozen-lockfile - name: 🔨 Build uses: tauri-apps/tauri-action@v0 @@ -79,13 +79,13 @@ jobs: - name: Rename soundcoremanager.exe if: matrix.platform == 'windows-latest' - run: ren src-tauri\target\release\deps\soundcoremanager.exe SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe + run: ren target\release\deps\soundcoremanager.exe SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe - name: ⏫ Upload Build Artifact if: matrix.platform == 'windows-latest' uses: actions/upload-artifact@v3 with: name: SoundcoreManager-${{ matrix.platform }}.exe - path: src-tauri\target\release\deps\SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe + path: target\release\deps\SoundcoreManager-${{ matrix.platform }}-${{ env.SHORT_SHA }}.exe