diff --git a/.github/workflows/build-macos.yaml b/.github/workflows/build-macos.yaml index 6949c72988..da017f118c 100644 --- a/.github/workflows/build-macos.yaml +++ b/.github/workflows/build-macos.yaml @@ -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: @@ -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 @@ -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: @@ -317,7 +323,7 @@ jobs: See for more information. test-annex-more: - runs-on: macos-12 + runs-on: macos-13 needs: build-package steps: - name: Checkout this repository @@ -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: diff --git a/.github/workflows/template/build-{{ostype}}.yaml.j2 b/.github/workflows/template/build-{{ostype}}.yaml.j2 index 35aeb55976..5ab37c7dfa 100644 --- a/.github/workflows/template/build-{{ostype}}.yaml.j2 +++ b/.github/workflows/template/build-{{ostype}}.yaml.j2 @@ -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 diff --git a/.github/workflows/template/specs.yml b/.github/workflows/template/specs.yml index ab96e7abd2..7d173fb7d7 100644 --- a/.github/workflows/template/specs.yml +++ b/.github/workflows/template/specs.yml @@ -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]