Skip to content

Commit

Permalink
Attempt to fix mac pre-release builds
Browse files Browse the repository at this point in the history
The macOS pre-release builds haven't been running recently. I suspect
it's because they were on an older version of macOS (10.15) that GitHub
Actions no longer supports. I updated them to use a newer version (12)
and while I was at it I updated the other jobs from 11 to 12. There were
also some cache keys that had `macos-11.0` in the path, so I changed
those to `macos-12`. Admittedly I have no idea what I'm doing and this
might not work.
  • Loading branch information
ceedubs committed May 23, 2023
1 parent 7a987bf commit 828eb62
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -231,4 +231,4 @@ jobs:
if [ -n "$CHANGE" ]; then
echo "The interpreter-tests output has changed"
exit 1
fi
fi
2 changes: 1 addition & 1 deletion .github/workflows/pre-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

build_macos:
name: "build_macos"
runs-on: macos-10.15
runs-on: macos-12

steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 }}
Expand Down

0 comments on commit 828eb62

Please sign in to comment.