-
Notifications
You must be signed in to change notification settings - Fork 23
chore: Adopt SmithyDafnyMakefile.mk, fix nightly build #638
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.
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
Merged
robin-aws
merged 33 commits into
mainline
from
robin-aws/use-smithy-dafny-makefile-and-fix-nightly-build
Mar 18, 2024
Merged
Changes from all commits
Commits
Show all changes
33 commits
Select commit
Hold shift + click to select a range
ac7d75b
Adopt SmithyDafnyMakefile.mk, apply codegen CI
robin-aws cc6a9aa
Init submodule, include codegen workflow in relevant CI
robin-aws 1edaf93
shell: bash
robin-aws bb550a6
Add project.properties file
robin-aws e9b89df
Fix library list
robin-aws 7fb27cc
Another missing submodule init
robin-aws 6928635
Fix skipping dependencies
robin-aws 5952398
Use step outputs instead
robin-aws 9230d0d
Correct variable name
robin-aws 89258ff
Prettier path
robin-aws 9ae8669
regenerate Dafny, Java and C# code
robin-aws c45fda4
Account for change in client factory method return type
robin-aws b34b9af
Update MPL when regenerating code for potentially different Dafny ver…
robin-aws 289c92a
fail-fast: false
robin-aws 6066d4e
Restore manual edits
robin-aws 1d8df32
Create patch file
robin-aws 49ab6ea
Missing manual edit
robin-aws 8b55fd6
Update patch file
robin-aws 357e4c9
update setup-dafny-action
robin-aws 94f2799
setup_prettier is annoying
robin-aws c92d0fe
Account for MPL client types changing
robin-aws 495ad81
Doh
robin-aws 683976a
Using ProjectReference to MPL, update SDK version
robin-aws 3963774
Only setup prettier on MPL if we updated it
robin-aws 9a82482
Simple verification fix
robin-aws ad373e9
Revert another config change
robin-aws d97a967
Merge branch 'mainline' of github.com:aws/aws-encryption-sdk-dafny in…
robin-aws b54d598
missing submodule init in new workflow
robin-aws 8ac07a5
Missed the other jobs
robin-aws 3f27938
Up verification time limit to 150 (as it was before)
robin-aws 26838b3
Apply the trusty sledgehammer (will make it a patch if this doesn’t w…
robin-aws ad65f3c
Merge branch 'mainline' into robin-aws/use-smithy-dafny-makefile-and-…
robin-aws 3e1b265
Update .gitmodules
robin-aws File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| # | ||
| # This local action serves two purposes: | ||
| # | ||
| # 1. For core workflows like pull.yml and push.yml, | ||
| # it is uses to check that the checked in copy of generated code | ||
| # matches what the current submodule version of smithy-dafny generates. | ||
| # This is important to ensure whenever someone changes the models | ||
| # or needs to regenerate to pick up smithy-dafny improvements, | ||
| # they don't have to deal with unpleasant surprises. | ||
| # | ||
| # 2. For workflows that check compatibility with other Dafny versions, | ||
| # such as nightly_dafny.yml, it is necessary to regenerate the code | ||
| # for that version of Dafny first. | ||
| # This is ultimately because some of the code smithy-dafny generates | ||
| # is tightly coupled to what code Dafny itself generates. | ||
| # A concrete example is that Dafny 4.3 added TypeDescriptors | ||
| # as parameters when constructing datatypes like Option and Result. | ||
| # | ||
| # This is why this is a composite action instead of a reusable workflow: | ||
| # the latter executes in a separate runner environment, | ||
| # but here we need to actually overwrite the generated code in place | ||
| # so that subsequent steps can work correctly. | ||
| # | ||
| # This action assumes that the given version of Dafny and .NET 6.0.x | ||
| # have already been set up, since they are used to format generated code. | ||
| # | ||
| # Note that recursively generating code doesn't currently work in this repo | ||
| # with the version of the mpl pinned by the submodule, | ||
| # because the SharedMakefileV2.mk in it doesn't work with newer versions of smithy-dafny. | ||
| # Therefore by default we don't recursively regenerate code | ||
| # (accomplished by setting the POLYMORPH_DEPENDENCIES environment variable to ""). | ||
| # If `update-and-regenerate-mpl` is true, we first pull the latest mpl, | ||
| # which is necessary both for Makefile compatibility and so we can regenerate mpl code | ||
| # for compatibility with newer versions of Dafny. | ||
| # | ||
|
|
||
| name: "Polymorph code generation" | ||
| description: "Regenerates code using smithy-dafny, and optionally checks that the result matches the checked in state" | ||
| inputs: | ||
| dafny: | ||
| description: "The Dafny version to run" | ||
| required: true | ||
| type: string | ||
| library: | ||
| description: "Name of the library to regenerate code for" | ||
| required: true | ||
| type: string | ||
| diff-generated-code: | ||
| description: "Diff regenerated code against committed state" | ||
| required: true | ||
| type: boolean | ||
| update-and-regenerate-mpl: | ||
| description: "Locally update MPL to the tip of master and regenerate its code too" | ||
| required: false | ||
| default: false | ||
| type: boolean | ||
| runs: | ||
| using: "composite" | ||
| steps: | ||
| - name: Update MPL submodule locally if requested | ||
| if: inputs.update-and-regenerate-mpl == 'true' | ||
| shell: bash | ||
| run: | | ||
| git submodule update --init --recursive --remote --merge mpl | ||
|
|
||
| - name: Don't regenerate dependencies unless requested | ||
| id: dependencies | ||
| shell: bash | ||
| run: | | ||
| echo "PROJECT_DEPENDENCIES=${{ inputs.update-and-regenerate-mpl != 'true' && 'PROJECT_DEPENDENCIES=' || '' }}" >> $GITHUB_OUTPUT | ||
|
|
||
| - name: Regenerate Dafny code using smithy-dafny | ||
| # Unfortunately Dafny codegen doesn't work on Windows: | ||
| # https://github.com/smithy-lang/smithy-dafny/issues/317 | ||
| if: runner.os != 'Windows' | ||
| working-directory: ./${{ inputs.library }} | ||
| shell: bash | ||
| run: | | ||
| make polymorph_dafny ${{ steps.dependencies.outputs.PROJECT_DEPENDENCIES }} | ||
|
|
||
| - name: Set up prettier in MPL | ||
| if: inputs.update-and-regenerate-mpl == 'true' | ||
| shell: bash | ||
| # Annoyingly, prettier has to be installed in each library individually. | ||
| # And this is only necessary or even possible if we've updated the mpl submodule. | ||
| run: | | ||
| make -C mpl/AwsCryptographyPrimitives setup_prettier | ||
| make -C mpl/AwsCryptographicMaterialProviders setup_prettier | ||
| make -C mpl/ComAmazonawsKms setup_prettier | ||
| make -C mpl/ComAmazonawsDynamodb setup_prettier | ||
|
|
||
| - name: Regenerate Java code using smithy-dafny | ||
| # npx seems to be unavailable on Windows GHA runners, | ||
| # so we don't regenerate Java code on them either. | ||
| if: runner.os != 'Windows' | ||
| working-directory: ./${{ inputs.library }} | ||
| shell: bash | ||
| # smithy-dafny also formats generated code itself now, | ||
| # so prettier is a necessary dependency. | ||
| run: | | ||
| make setup_prettier | ||
| make polymorph_java ${{ steps.dependencies.outputs.PROJECT_DEPENDENCIES }} | ||
|
|
||
| - name: Regenerate .NET code using smithy-dafny | ||
| working-directory: ./${{ inputs.library }} | ||
| shell: bash | ||
| run: | | ||
| make polymorph_dotnet ${{ steps.dependencies.outputs.PROJECT_DEPENDENCIES }} | ||
|
|
||
| - name: Check regenerated code against commited code | ||
| # Composite action inputs seem to not actually support booleans properly for some reason | ||
| if: inputs.diff-generated-code == 'true' | ||
| working-directory: ./${{ inputs.library }} | ||
| shell: bash | ||
| run: | | ||
| make check_polymorph_diff | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # This workflow regenerates code using smithy-dafny and checks that the output matches what's checked in. | ||
| name: Library Code Generation | ||
| on: | ||
| workflow_call: | ||
| inputs: | ||
| dafny: | ||
| description: "The Dafny version to run" | ||
| required: true | ||
| type: string | ||
|
|
||
| jobs: | ||
| code-generation: | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| library: | ||
| [ | ||
| AwsEncryptionSDK, | ||
| ] | ||
| # Note dotnet is only used for formatting generated code | ||
| # in this workflow | ||
| dotnet-version: ["6.0.x"] | ||
| os: [ubuntu-latest] | ||
| runs-on: ${{ matrix.os }} | ||
| defaults: | ||
| run: | ||
| shell: bash | ||
| env: | ||
| DOTNET_CLI_TELEMETRY_OPTOUT: 1 | ||
| DOTNET_NOLOGO: 1 | ||
| steps: | ||
| - name: Support longpaths | ||
| run: | | ||
| git config --global core.longpaths true | ||
|
|
||
| - uses: actions/checkout@v4 | ||
| # The specification submodule is private so we don't have access, but we don't need | ||
| # it to verify the Dafny code. Instead we manually pull the submodules we DO need. | ||
| - run: git submodule update --init libraries | ||
| - run: git submodule update --init --recursive mpl | ||
| - run: git submodule update --init smithy-dafny | ||
|
|
||
| # Only used to format generated code | ||
| # and to translate version strings such as "nightly-latest" | ||
| # to an actual DAFNY_VERSION. | ||
| - name: Setup Dafny | ||
| uses: dafny-lang/setup-dafny-action@v1.7.0 | ||
| with: | ||
| dafny-version: ${{ inputs.dafny }} | ||
|
|
||
| - name: Setup .NET Core SDK ${{ matrix.dotnet-version }} | ||
| uses: actions/setup-dotnet@v3 | ||
| with: | ||
| dotnet-version: ${{ matrix.dotnet-version }} | ||
|
|
||
| - uses: ./.github/actions/polymorph_codegen | ||
| with: | ||
| dafny: ${{ env.DAFNY_VERSION }} | ||
| library: ${{ matrix.library }} | ||
| diff-generated-code: true |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| # This workflow invokes other workflows with the requested Dafny build. | ||
| # It is primarily meant for manual compatibility testing, | ||
| # such as trying out what the next pending nightly build will do ahead of time. | ||
| name: Manual CI | ||
|
|
||
| on: | ||
| workflow_dispatch: | ||
| inputs: | ||
| dafny: | ||
| description: "The Dafny version to use" | ||
| required: true | ||
| type: string | ||
| regenerate-code: | ||
| description: "Regenerate code using smithy-dafny" | ||
| required: false | ||
| default: true | ||
| type: boolean | ||
|
|
||
| jobs: | ||
| manual-ci-verification: | ||
| uses: ./.github/workflows/library_dafny_verification.yml | ||
| with: | ||
| dafny: ${{ inputs.dafny }} | ||
| regenerate-code: ${{ inputs.regenerate-code }} | ||
| # manual-ci-java: | ||
| # uses: ./.github/workflows/library_java_tests.yml | ||
| # with: | ||
| # dafny: ${{ inputs.dafny }} | ||
| # regenerate-code: ${{ inputs.regenerate-code }} | ||
| manual-ci-net: | ||
| uses: ./.github/workflows/library_net_tests.yml | ||
| with: | ||
| dafny: ${{ inputs.dafny }} | ||
| regenerate-code: ${{ inputs.regenerate-code }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.