diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 8da340e8bf..737cd24f4e 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -41,7 +41,7 @@ jobs: os: # While iterating on this file, you can disable one or more of these to speed things up - ubuntu-20.04 - - macOS-11.0 + - macOS-12 - windows-2019 steps: - uses: actions/checkout@v2 @@ -231,4 +231,4 @@ jobs: if [ -n "$CHANGE" ]; then echo "The interpreter-tests output has changed" exit 1 - fi \ No newline at end of file + fi diff --git a/.github/workflows/pre-release.yaml b/.github/workflows/pre-release.yaml index 18473efd95..12adecb25f 100644 --- a/.github/workflows/pre-release.yaml +++ b/.github/workflows/pre-release.yaml @@ -53,7 +53,7 @@ jobs: build_macos: name: "build_macos" - runs-on: macos-10.15 + runs-on: macos-12 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fa91052bcf..5625dec3f5 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -132,7 +132,7 @@ jobs: build_macos: name: "build_macos" - runs-on: macos-11 + runs-on: macos-12 env: UNISON_BASE_PATH: "${{inputs.share_base_path}}" steps: @@ -151,11 +151,11 @@ jobs: # recent branch cache. # Then it will save a new cache at this commit sha, which should be used by # the next build on this branch. - key: stack-0_macOS-11.0-${{hashFiles('stack.yaml')}}-${{github.sha}} + key: stack-0_macOS-12-${{hashFiles('stack.yaml')}}-${{github.sha}} # Fall-back to use the most recent cache for the stack.yaml, or failing that the OS restore-keys: | - stack-0_macOS-11.0-${{hashFiles('stack.yaml')}} - stack-0_macOS-11.0 + stack-0_macOS-12-${{hashFiles('stack.yaml')}} + stack-0_macOS-12 # Cache each local package's ~/.stack-work for fast incremental builds in CI. - uses: actions/cache@v3 @@ -169,8 +169,8 @@ jobs: # recent branch cache. # Then it will save a new cache at this commit sha, which should be used by # the next build on this branch. - key: stack-work-3_macOS-11.0-${{github.sha}} - restore-keys: stack-work-3_macOS-11.0 + key: stack-work-3_macOS-12-${{github.sha}} + restore-keys: stack-work-3_macOS-12 - name: install stack (macOS) working-directory: ${{ github.workspace }}