Skip to content

Commit

Permalink
workflows: various cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
Bo98 committed Oct 26, 2023
1 parent b4ad12a commit 33568fd
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 15 deletions.
8 changes: 1 addition & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@ permissions:
env:
HOMEBREW_DEVELOPER: 1
HOMEBREW_NO_AUTO_UPDATE: 1
HOMEBREW_CHANGE_ARCH_TO_ARM: 1

jobs:
build:
strategy:
matrix:
include:
- os: '10.11-cross-${{github.run_id}}-${{github.run_attempt}}'
- os: '10.11-cross-${{github.run_id}}'
- os: '11-arm64'
- os: 'ubuntu-latest'
container:
Expand All @@ -30,11 +29,6 @@ jobs:
run:
working-directory: ${{matrix.workdir || github.workspace}}
steps:
- name: Set environment variables
if: runner.os == 'macOS'
run: |
echo 'PATH=/opt/homebrew/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin' >> $GITHUB_ENV
- name: Set up Homebrew
uses: Homebrew/actions/setup-homebrew@master

Expand Down
10 changes: 6 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ env:
HOMEBREW_NO_AUTO_UPDATE: 1

permissions:
contents: write
packages: write
contents: read

jobs:
determine-tag:
Expand Down Expand Up @@ -47,17 +46,20 @@ jobs:
runs-on: ubuntu-latest
env:
TAG: ${{ needs.determine-tag.outputs.tag }}
permissions:
contents: write
packages: write
steps:
- name: Set up Homebrew
uses: Homebrew/actions/setup-homebrew@master
with:
test-bot: false

- name: Checkout branch
run: git checkout "${{ github.ref_name }}"
run: git checkout "${GITHUB_REF_NAME}"

- name: Install gems
run: brew install-bundler-gems
run: brew install-bundler-gems --groups=pr_upload

- name: Configure Git user
uses: Homebrew/actions/git-user-config@master
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,14 @@
name: CI

on:
push:
branches:
- master
pull_request:

permissions:
contents: read

concurrency:
group: "${{ github.ref }}"
cancel-in-progress: ${{ github.event_name == 'pull_request' }}
cancel-in-progress: true

jobs:
tests:
Expand Down

0 comments on commit 33568fd

Please sign in to comment.