Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/cli-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ permissions:
jobs:
tests:
uses: ./.github/workflows/cli-tests.yaml
with:
run-mac-tests: true

prerelease:
runs-on: ubuntu-latest
Expand Down
13 changes: 10 additions & 3 deletions .github/workflows/cli-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ on:
branches:
- main
workflow_call:
inputs:
run-mac-tests:
type: boolean
workflow_dispatch:

permissions:
Expand All @@ -29,7 +32,7 @@ jobs:
golangci-lint:
strategy:
matrix:
os: [ubuntu-latest, macos-12]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
timeout-minutes: 10
steps:
Expand Down Expand Up @@ -59,9 +62,13 @@ jobs:
test:
strategy:
matrix:
os: [ubuntu-latest, macos-12]
os: [ubuntu-latest, macos-latest]
exclude:
# This expression basically says run mac tests if on main branch or
# if this job is triggered by another workflow with "with: run-mac-tests: true"
- os: ${{ (github.ref == 'refs/heads/main' || inputs.run-mac-tests) && 'dummy' || 'macos-latest' }}
runs-on: ${{ matrix.os }}
timeout-minutes: 15
timeout-minutes: ${{ (github.ref == 'refs/heads/main' || inputs.run-mac-tests) && '20' || '10' }}
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3.5.0
Expand Down