Skip to content

Commit

Permalink
build: run macos-14 (with Docker)
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdecaf committed Sep 30, 2024
1 parent 6cfd0ff commit 228f68f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/cgo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, macos-14, windows-latest]
version: [stable, oldstable]
steps:
- name: Set up Go 1.x
Expand All @@ -29,19 +29,19 @@ jobs:
run: choco install -y make mingw

- name: Setup
if: runner.os == 'Linux'
if: runner.os == 'Linux' || matrix.os == 'macos-14'
run: make setup

- name: Check
if: runner.os == 'Linux'
if: runner.os == 'Linux' || matrix.os == 'macos-14'
run: make check

- name: Short Check
if: runner.os != 'Linux'
if: runner.os != 'Linux' && matrix.os != 'macos-14'
run: make check
env:
GOTEST_FLAGS: "-short"

- name: Logs
if: failure() && runner.os == 'Linux'
if: always()
run: docker compose logs
10 changes: 5 additions & 5 deletions .github/workflows/nocgo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest, windows-latest]
os: [ubuntu-latest, macos-13, macos-14, windows-latest]
version: [stable, oldstable]
steps:
- name: Set up Go 1.x
Expand All @@ -29,22 +29,22 @@ jobs:
run: choco install -y make mingw

- name: Setup
if: runner.os == 'Linux'
if: runner.os == 'Linux' || matrix.os == 'macos-14'
run: make setup

- name: Check
if: runner.os == 'Linux'
if: runner.os == 'Linux' || matrix.os == 'macos-14'
run: make check
env:
CGO_ENABLED: "0"

- name: Short Check
if: runner.os != 'Linux'
if: runner.os != 'Linux' && matrix.os != 'macos-14'
run: make check
env:
CGO_ENABLED: "0"
GOTEST_FLAGS: "-short"

- name: Logs
if: failure() && runner.os == 'Linux'
if: always()
run: docker compose logs

0 comments on commit 228f68f

Please sign in to comment.