Skip to content

Commit 33568fd

Browse files
committed
workflows: various cleanups
1 parent b4ad12a commit 33568fd

File tree

3 files changed

+8
-15
lines changed

3 files changed

+8
-15
lines changed

.github/workflows/build.yml

+1-7
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,13 @@ permissions:
99
env:
1010
HOMEBREW_DEVELOPER: 1
1111
HOMEBREW_NO_AUTO_UPDATE: 1
12-
HOMEBREW_CHANGE_ARCH_TO_ARM: 1
1312

1413
jobs:
1514
build:
1615
strategy:
1716
matrix:
1817
include:
19-
- os: '10.11-cross-${{github.run_id}}-${{github.run_attempt}}'
18+
- os: '10.11-cross-${{github.run_id}}'
2019
- os: '11-arm64'
2120
- os: 'ubuntu-latest'
2221
container:
@@ -30,11 +29,6 @@ jobs:
3029
run:
3130
working-directory: ${{matrix.workdir || github.workspace}}
3231
steps:
33-
- name: Set environment variables
34-
if: runner.os == 'macOS'
35-
run: |
36-
echo 'PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' >> $GITHUB_ENV
37-
3832
- name: Set up Homebrew
3933
uses: Homebrew/actions/setup-homebrew@master
4034

.github/workflows/release.yml

+6-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ env:
88
HOMEBREW_NO_AUTO_UPDATE: 1
99

1010
permissions:
11-
contents: write
12-
packages: write
11+
contents: read
1312

1413
jobs:
1514
determine-tag:
@@ -47,17 +46,20 @@ jobs:
4746
runs-on: ubuntu-latest
4847
env:
4948
TAG: ${{ needs.determine-tag.outputs.tag }}
49+
permissions:
50+
contents: write
51+
packages: write
5052
steps:
5153
- name: Set up Homebrew
5254
uses: Homebrew/actions/setup-homebrew@master
5355
with:
5456
test-bot: false
5557

5658
- name: Checkout branch
57-
run: git checkout "${{ github.ref_name }}"
59+
run: git checkout "${GITHUB_REF_NAME}"
5860

5961
- name: Install gems
60-
run: brew install-bundler-gems
62+
run: brew install-bundler-gems --groups=pr_upload
6163

6264
- name: Configure Git user
6365
uses: Homebrew/actions/git-user-config@master

.github/workflows/tests.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
name: CI
22

33
on:
4-
push:
5-
branches:
6-
- master
74
pull_request:
85

96
permissions:
107
contents: read
118

129
concurrency:
1310
group: "${{ github.ref }}"
14-
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
11+
cancel-in-progress: true
1512

1613
jobs:
1714
tests:

0 commit comments

Comments
 (0)