Skip to content

Commit

Permalink
Merge pull request #215 from datalad/bf-mac
Browse files Browse the repository at this point in the history
Switch to macos-13 since -12 is gone
  • Loading branch information
yarikoptic authored Dec 5, 2024
2 parents ba621f5 + e7a09a9 commit 49f8641
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 6 deletions.
14 changes: 10 additions & 4 deletions .github/workflows/build-macos.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ env:

jobs:
build-package:
runs-on: macos-12
runs-on: macos-13
outputs:
build-version: ${{ steps.build-version.outputs.version }}
steps:
Expand All @@ -47,6 +47,12 @@ jobs:
- name: Set up system
run: brew install libmagic pkg-config

- name: Setup Haskell
uses: haskell/actions/setup@v2
with:
enable-stack: true
stack-no-global: true

- name: Determine git-annex ref to build
run: |
. .github/workflows/tools/set-build-commit
Expand Down Expand Up @@ -183,7 +189,7 @@ jobs:
strategy:
matrix:
flavor: ["normal", "crippled-tmp", "custom-config1"]
os: [macos-12]
os: [macos-13]
include: [{"flavor": "normal", "os": "macos-latest"}]
fail-fast: false
steps:
Expand Down Expand Up @@ -317,7 +323,7 @@ jobs:
See <https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}> for more information.
test-annex-more:
runs-on: macos-12
runs-on: macos-13
needs: build-package
steps:
- name: Checkout this repository
Expand Down Expand Up @@ -370,7 +376,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

test-datalad:
runs-on: macos-12
runs-on: macos-13
needs: build-package
strategy:
matrix:
Expand Down
5 changes: 4 additions & 1 deletion .github/workflows/template/build-{{ostype}}.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -74,13 +74,16 @@ jobs:
- name: Set up system
run: brew install libmagic pkg-config

{% elif ostype == "windows" %}
{% endif %}
{% if ostype == "windows" or ostype == "macos" %}
- name: Setup Haskell
uses: haskell/actions/setup@v2
with:
enable-stack: true
stack-no-global: true

{% endif %}
{% if ostype == "windows" %}
- name: Handle long filenames
run: git config --system core.longpaths true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/template/specs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
- ostype: macos
osname: macOS
cron_hour: '01'
runs_on: macos-12
runs_on: macos-13
env:
LANG: C
test_annex_flavors: [normal, crippled-tmp, custom-config1]
Expand Down

0 comments on commit 49f8641

Please sign in to comment.