Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ci: Align mostly on macos-11 #5531

Closed
wants to merge 6 commits into from
Closed

ci: Align mostly on macos-11 #5531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
66bd1ca
Revert "Revert "ci: Use macos-11 in all CI (#5493)" (#5503)"
robin-aws Jun 5, 2024
6c79506
Merge branch 'master' of github.com:dafny-lang/dafny into align-mostl…
robin-aws Jun 5, 2024
827d30c
Use macos-latest for publish-release
robin-aws Jun 5, 2024
2a8f054
Fix bad merge
robin-aws Jun 5, 2024
86a2276
Use 10 shards for `run-deep-tests` too for consistency
robin-aws Jun 5, 2024
980e88e
Merge branch 'master' into align-mostly-on-macos-11
robin-aws Jun 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Revert "Revert "ci: Use macos-11 in all CI (#5493)" (#5503)" 
This reverts commit b5040b9.
  • Loading branch information
@robin-aws
robin-aws committed Jun 5, 2024
commit 66bd1caf1264c8283e58d0475c089bf5a28e7f36
4 changes: 2 additions & 2 deletions .github/workflows/integration-tests-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ jobs:
- name: Populate OS list (all platforms)
id: populate-os-list-all
if: inputs.all_platforms
run: echo "os-list=[\"ubuntu-latest\", \"ubuntu-20.04\", \"macos-latest\", \"windows-2019\"]" >> $GITHUB_OUTPUT
run: echo "os-list=[\"ubuntu-latest\", \"ubuntu-20.04\", \"macos-11\", \"windows-2019\"]" >> $GITHUB_OUTPUT
- name: Populate OS list (one platform)
id: populate-os-list-one
if: "!inputs.all_platforms"
run: echo "os-list=[\"ubuntu-20.04\"]" >> $GITHUB_OUTPUT
- name: Populate OS mapping for package.py
id: populate-os-mapping
run: |
echo "os-mapping={\"ubuntu-latest\": \"ubuntu\", \"ubuntu-20.04\": \"ubuntu\", \"macos-latest\": \"macos\", \"windows-2019\": \"windows\"}" >> $GITHUB_OUTPUT
echo "os-mapping={\"ubuntu-latest\": \"ubuntu\", \"ubuntu-20.04\": \"ubuntu\", \"macos-11\": \"macos\", \"windows-2019\": \"windows\"}" >> $GITHUB_OUTPUT
- name: Populate target runtime version list (all platforms)
id: populate-target-runtime-version-all
if: inputs.all_platforms
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-release-reusable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ env:
jobs:

publish-release:
runs-on: macos-latest # Put back 'ubuntu-20.04' if macos-latest fails in any way
runs-on: macos-11 # Put back 'ubuntu-20.04' if macos-11 fails in any way
steps:
- name: Print version
run: echo ${{ inputs.name }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-brew.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ concurrency:
jobs:
build:

runs-on: macos-latest
runs-on: macos-11

steps:
- name: Install dafny
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-downloads-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ jobs:
# but note we need to skip Dafny since nuget install doesn't work for dotnet tools.
library-name: [ DafnyPipeline, DafnyServer, DafnyLanguageServer, DafnyRuntime, DafnyCore, DafnyDriver ]
# This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
os: [ ubuntu-latest, ubuntu-20.04, macos-latest, windows-2019 ]
os: [ ubuntu-latest, ubuntu-20.04, macos-11, windows-2019 ]

steps:
# Verify that the dependencies of the libraries we publish (e.g. DafnyLanguageServer)
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release-downloads.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ jobs:
fail-fast: false
matrix:
# This workflow breaks on windows-2022: https://github.com/dafny-lang/dafny/issues/1906
os: [ ubuntu-latest, ubuntu-20.04, macos-latest, windows-2019 ]
os: [ ubuntu-latest, ubuntu-20.04, macos-11, windows-2019 ]
include:
- os: 'ubuntu-latest'
osn: 'ubuntu-20.04'
- os: 'ubuntu-20.04'
osn: 'ubuntu-20.04'
- os: 'macos-latest'
- os: 'macos-11'
osn: 'x64-macos-11'
- os: 'windows-2019'
osn: 'windows-2019'
Expand Down