diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 0a6f188..936ffd3 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -6,30 +6,34 @@ on: jobs: pr-pull: if: contains(github.event.pull_request.labels.*.name, 'pr-pull') - runs-on: ubuntu-22.04 - env: - HOMEBREW_NO_INSTALL_FROM_API: 1 + runs-on: ubuntu-24.04 + permissions: + contents: write + packages: none + pull-requests: write steps: - name: Set up Homebrew uses: Homebrew/actions/setup-homebrew@master + - name: Set up git uses: Homebrew/actions/git-user-config@master + - 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 with: token: ${{ github.token }} - branch: main + branch: master - name: Delete branch 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 80a5ec4..c65ec0e 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -8,32 +8,35 @@ jobs: test-bot: strategy: matrix: - os: [ubuntu-22.04, macos-13, macos-14] + os: [ubuntu-22.04, ubuntu-24.04, macos-13, macos-14] runs-on: ${{ matrix.os }} env: - HOMEBREW_NO_INSTALL_FROM_API: 1 + HOMEBREW_GITHUB_API_TOKEN: ${{ secrets.HOMEBREW_API_TOKEN }} steps: - name: Set up Homebrew id: set-up-homebrew 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- - - name: Install Homebrew Bundler RubyGems - if: steps.cache.outputs.cache-hit != 'true' - run: brew install-bundler-gems + - run: brew test-bot --only-cleanup-before + - run: brew test-bot --only-setup + - run: brew test-bot --only-tap-syntax + - run: brew test-bot --only-formulae if: github.event_name == 'pull_request' + - name: Upload bottles as artifact if: always() && github.event_name == 'pull_request' - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: bottles + name: bottles_${{ matrix.os }} path: '*.bottle.*'