From c5e0a518697d336304dec4850499ea0ea292e86f Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 30 Sep 2024 10:07:39 -0400 Subject: [PATCH 1/3] chore:always use dotnet 6 for format checking --- .github/actions/polymorph_codegen/action.yml | 2 ++ .github/workflows/ci_codegen.yml | 3 +++ 2 files changed, 5 insertions(+) diff --git a/.github/actions/polymorph_codegen/action.yml b/.github/actions/polymorph_codegen/action.yml index 6f7a64fa5..f8ebeca5c 100644 --- a/.github/actions/polymorph_codegen/action.yml +++ b/.github/actions/polymorph_codegen/action.yml @@ -96,6 +96,8 @@ runs: shell: bash run: | echo "PROJECT_DEPENDENCIES=${{ inputs.update-and-regenerate-mpl != 'true' && 'PROJECT_DEPENDENCIES=' || '' }}" >> $GITHUB_OUTPUT + run: | + dotnet --version - name: Regenerate Dafny code using smithy-dafny # Unfortunately Dafny codegen doesn't work on Windows: diff --git a/.github/workflows/ci_codegen.yml b/.github/workflows/ci_codegen.yml index 092259a40..6bbee248d 100644 --- a/.github/workflows/ci_codegen.yml +++ b/.github/workflows/ci_codegen.yml @@ -48,6 +48,9 @@ jobs: with: dotnet-version: ${{ matrix.dotnet-version }} + - name: Create temporary global.json + run: echo '{"sdk":{"rollForward":"latestFeature","version":"6.0.0"}}' > ./global.json + - name: Setup Java 17 for codegen uses: actions/setup-java@v3 with: From f76cfc9253cc440c9605525bcec7ccbcf6601797 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 30 Sep 2024 10:17:18 -0400 Subject: [PATCH 2/3] m --- .github/actions/polymorph_codegen/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/actions/polymorph_codegen/action.yml b/.github/actions/polymorph_codegen/action.yml index f8ebeca5c..f85cac68a 100644 --- a/.github/actions/polymorph_codegen/action.yml +++ b/.github/actions/polymorph_codegen/action.yml @@ -96,6 +96,8 @@ runs: shell: bash run: | echo "PROJECT_DEPENDENCIES=${{ inputs.update-and-regenerate-mpl != 'true' && 'PROJECT_DEPENDENCIES=' || '' }}" >> $GITHUB_OUTPUT + + - name: Print dotnet version run: | dotnet --version From 3f175a62ef00675485c6f0625c17481c98646454 Mon Sep 17 00:00:00 2001 From: Andy Jewell Date: Mon, 30 Sep 2024 10:26:16 -0400 Subject: [PATCH 3/3] m --- .github/actions/polymorph_codegen/action.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/actions/polymorph_codegen/action.yml b/.github/actions/polymorph_codegen/action.yml index f85cac68a..302523dae 100644 --- a/.github/actions/polymorph_codegen/action.yml +++ b/.github/actions/polymorph_codegen/action.yml @@ -98,6 +98,7 @@ runs: echo "PROJECT_DEPENDENCIES=${{ inputs.update-and-regenerate-mpl != 'true' && 'PROJECT_DEPENDENCIES=' || '' }}" >> $GITHUB_OUTPUT - name: Print dotnet version + shell: bash run: | dotnet --version