Skip to content

Commit 4c709d9

Browse files
committed
chore: re-enable Dafny for MacOS
.NET had a signature failure in MacOS. This was fixed in 9.0.202. This installs at least this version of .NET to make the setup-dafny-action succeed.
1 parent d988c6e commit 4c709d9

19 files changed

+53
-24
lines changed
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
#
2+
#
3+
# This local action consolidate all uses of dafny-lang/setup-dafny-action
4+
# Once the MPL is updated, this action can point to the MPL version.
5+
#
6+
name: "Setup Dafny"
7+
description: "This uses the setup Dafny action."
8+
inputs:
9+
dafny-version:
10+
description: "The Dafny version to setup"
11+
required: true
12+
type: string
13+
runs:
14+
using: "composite"
15+
steps:
16+
# The dotnet tool requires >= 9.0.202 to work on MacOS
17+
# See: https://github.com/dotnet/sdk/issues/46857#issuecomment-2734338347
18+
# Ideally this action would only install this on MacOS,
19+
# but I do not want to keep track of the various values
20+
# See: https://docs.github.com/en/actions/writing-workflows/choosing-what-your-workflow-does/store-information-in-variables#detecting-the-operating-system
21+
- name: Setup .NET Core SDK '9.0.x'
22+
uses: actions/setup-dotnet@v3
23+
with:
24+
dotnet-version: "9.0.x"
25+
26+
- name: Setup Dafny with setup-dafny action
27+
uses: dafny-lang/[email protected]
28+
with:
29+
dafny-version: ${{ inputs.dafny-version }}

.github/workflows/ci_codegen.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
# and to translate version strings such as "nightly-latest"
4040
# to an actual DAFNY_VERSION.
4141
- name: Setup Dafny
42-
uses: dafny-lang/[email protected]
42+
uses: ./.github/actions/setup_dafny
4343
with:
4444
dafny-version: ${{ inputs.dafny }}
4545

.github/workflows/ci_examples_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
java-version: ${{ matrix.java-version }}
5454

5555
- name: Setup Dafny
56-
uses: dafny-lang/[email protected]
56+
uses: ./.github/actions/setup_dafny
5757
with:
5858
dafny-version: ${{ inputs.dafny }}
5959

.github/workflows/ci_examples_net.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
dotnet-version: ${{ matrix.dotnet-version }}
4747

4848
- name: Setup Dafny
49-
uses: dafny-lang/[email protected]
49+
uses: ./.github/actions/setup_dafny
5050
with:
5151
dafny-version: ${{ inputs.dafny }}
5252

.github/workflows/ci_test_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
submodules: recursive
4848

4949
- name: Setup Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./.github/actions/setup_dafny
5151
with:
5252
dafny-version: ${{ inputs.dafny }}
5353

.github/workflows/ci_test_latest_released_mpl_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
java-version: ${{ matrix.java-version }}
5555

5656
- name: Setup Dafny
57-
uses: dafny-lang/[email protected]
57+
uses: ./.github/actions/setup_dafny
5858
with:
5959
dafny-version: ${{ needs.getVersion.outputs.version }}
6060

.github/workflows/ci_test_net.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
dotnet-version: ${{ matrix.dotnet-version }}
4848

4949
- name: Setup Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./.github/actions/setup_dafny
5151
with:
5252
dafny-version: ${{ inputs.dafny }}
5353

.github/workflows/ci_test_vector_java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
submodules: recursive
5757

5858
- name: Setup Dafny
59-
uses: dafny-lang/[email protected]
59+
uses: ./.github/actions/setup_dafny
6060
with:
6161
dafny-version: ${{ inputs.dafny }}
6262

.github/workflows/ci_test_vector_net.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
submodules: recursive
5353

5454
- name: Setup Dafny
55-
uses: dafny-lang/[email protected]
55+
uses: ./.github/actions/setup_dafny
5656
with:
5757
dafny-version: ${{ inputs.dafny }}
5858

.github/workflows/dafny_interop_examples_java.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
fetch-depth: 0
4848

4949
- name: Setup MPL Dafny
50-
uses: dafny-lang/[email protected]
50+
uses: ./.github/actions/setup_dafny
5151
with:
5252
dafny-version: ${{ inputs.mpl-dafny }}
5353

@@ -73,7 +73,7 @@ jobs:
7373
make build_java CORES=$CORES
7474
7575
- name: Setup DBESDK Dafny
76-
uses: dafny-lang/[email protected]
76+
uses: ./.github/actions/setup_dafny
7777
with:
7878
dafny-version: ${{ inputs.dbesdk-dafny}}
7979

0 commit comments

Comments
 (0)