diff --git a/.github/workflows/rust.yaml b/.github/workflows/rust.yaml index 2d0d0a3..d944228 100644 --- a/.github/workflows/rust.yaml +++ b/.github/workflows/rust.yaml @@ -35,8 +35,6 @@ jobs: command: build args: --workspace --all-targets --all-features --release - - - name: Check for release id: is-release shell: bash @@ -50,8 +48,6 @@ jobs: name: rust_cat.exe path: target/release/rust_cat.exe - - - name: Publish archives and packages (Windows) uses: softprops/action-gh-release@v1 if: steps.is-release.outputs.IS_RELEASE @@ -61,15 +57,21 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - # Create universal macOS app bundle build-macos: name: Create universal macOS app bundle runs-on: macos-latest - if: github.event_name != 'pull_request' || github.actor != 'dependabot[bot]' steps: - uses: actions/checkout@v4 - + - uses: actions/cache@v4 + with: + path: | + ~/.cargo/bin/ + ~/.cargo/registry/index/ + ~/.cargo/registry/cache/ + ~/.cargo/git/db/ + target/ + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - uses: actions-rs/toolchain@v1 with: profile: minimal @@ -110,7 +112,7 @@ jobs: # Auto-approve Dependabot PRs if build succeeds dependabot-auto-approve: - runs-on: windows-latest + runs-on: ubuntu-latest needs: [build-windows, build-macos] if: github.actor == 'dependabot[bot]' && github.event_name == 'pull_request' steps: @@ -118,9 +120,3 @@ jobs: uses: hmarr/auto-approve-action@v4 with: github-token: ${{ secrets.GITHUB_TOKEN }} - - - name: Enable auto-merge - run: | - gh pr merge --auto --squash "${{ github.event.pull_request.number }}" - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/Cargo.lock b/Cargo.lock index 4d64bf0..009720c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -360,7 +360,7 @@ dependencies = [ [[package]] name = "trayicon" version = "0.2.0" -source = "git+https://github.com/bearice/trayicon-rs.git#18fbff21701485084b1238d39036bf88afc982ba" +source = "git+https://github.com/bearice/trayicon-rs.git#67d32cd7e9933bd26853480db02c112427cec066" dependencies = [ "objc2", "objc2-app-kit",