diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 5aaf829..34da9c3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,14 +1,17 @@ name: brew pr-pull + on: pull_request_target: types: - labeled -env: - HOMEBREW_NO_INSTALL_FROM_API: 1 + jobs: pr-pull: if: contains(github.event.pull_request.labels.*.name, 'pr-pull') runs-on: ubuntu-22.04 + permissions: + contents: write + pull-requests: write steps: - name: Set up Homebrew uses: Homebrew/actions/setup-homebrew@master @@ -19,10 +22,8 @@ jobs: - name: Pull bottles env: HOMEBREW_GITHUB_API_TOKEN: ${{ github.token }} - HOMEBREW_GITHUB_PACKAGES_TOKEN: ${{ github.token }} - HOMEBREW_GITHUB_PACKAGES_USER: ${{ github.actor }} PULL_REQUEST: ${{ github.event.pull_request.number }} - run: brew pr-pull --debug --tap=$GITHUB_REPOSITORY $PULL_REQUEST + run: brew pr-pull --debug --tap="$GITHUB_REPOSITORY" "$PULL_REQUEST" - name: Push commits uses: Homebrew/actions/git-try-push@master @@ -34,4 +35,4 @@ jobs: if: github.event.pull_request.head.repo.fork == false env: BRANCH: ${{ github.event.pull_request.head.ref }} - run: git push --delete origin $BRANCH + run: git push --delete origin "$BRANCH" diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 103bc8b..6792043 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -1,16 +1,16 @@ name: brew test-bot + on: push: branches: - main pull_request: -env: - HOMEBREW_NO_INSTALL_FROM_API: 1 + jobs: test-bot: strategy: matrix: - os: [ubuntu-22.04, macos-13] + os: [ubuntu-22.04, macos-13, macos-14] runs-on: ${{ matrix.os }} steps: - name: Set up Homebrew @@ -18,12 +18,11 @@ jobs: uses: Homebrew/actions/setup-homebrew@master - name: Cache Homebrew Bundler RubyGems - id: cache - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.set-up-homebrew.outputs.gems-path }} - key: ${{ runner.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }} - restore-keys: ${{ runner.os }}-rubygems- + key: ${{ matrix.os }}-rubygems-${{ steps.set-up-homebrew.outputs.gems-hash }} + restore-keys: ${{ matrix.os }}-rubygems- - run: brew test-bot --only-cleanup-before @@ -36,7 +35,7 @@ jobs: - name: Upload bottles as artifact if: always() && github.event_name == 'pull_request' - uses: actions/upload-artifact@main + uses: actions/upload-artifact@v4 with: - name: bottles + name: bottles_${{ matrix.os }} path: '*.bottle.*'