diff --git a/.github/actions/install_smithy_dafny_codegen_dependencies/action.yml b/.github/actions/install_smithy_dafny_codegen_dependencies/action.yml deleted file mode 100644 index 8e2bd19a6c..0000000000 --- a/.github/actions/install_smithy_dafny_codegen_dependencies/action.yml +++ /dev/null @@ -1,62 +0,0 @@ -# -# This local action sets up code dependencies -# to run Smithy-Dafny CI in GitHub Actions workflows. -# - -name: "Install Smithy-Dafny codegen dependencies" -description: "Install Java package dependencies required to run Smithy-Dafny codegen" -runs: - using: "composite" - steps: - - name: Setup Java 17 for codegen - uses: actions/setup-java@v5 - with: - distribution: "corretto" - java-version: "17" - cache: "gradle" - - - name: Cache Maven local repository - uses: actions/cache@v4 - with: - path: ~/.m2/repository - key: ${{ runner.os }}-maven-smithy-dafny - restore-keys: | - ${{ runner.os }}-maven- - - - name: Install smithy-dafny-codegen dependencies locally - shell: bash - run: | - make -C submodules/smithy-dafny mvn_local_deploy_polymorph_dependencies - - - name: Setup Python, black, and docformatter for code formatting - uses: actions/setup-python@v6 - with: - python-version: 3.11 - architecture: x64 - cache: "pip" - - shell: bash - run: | - python -m pip install --upgrade pip - python -m pip install black==25.1 - python -m pip install --upgrade docformatter - - - name: Install Go - uses: actions/setup-go@v6 - with: - go-version: "1.23" - cache: false # No go.mod at repo root; project-level caching handled in test workflows - - - name: Install Go imports - uses: nick-fields/retry@v3 - with: - timeout_minutes: 10 - retry_wait_seconds: 30 - max_attempts: 3 - shell: bash - command: go install golang.org/x/tools/cmd/goimports@v0.36.0 - - # Without this the if-dafny-at-least command includes "Downloading ..." output - - name: Arbitrary makefile target to force downloading Gradle - shell: bash - run: | - make -C submodules/MaterialProviders/StandardLibrary setup_net diff --git a/.github/workflows/check-files.yml b/.github/workflows/check-files.yml index 256e761717..20db6bee42 100644 --- a/.github/workflows/check-files.yml +++ b/.github/workflows/check-files.yml @@ -14,7 +14,7 @@ jobs: env: # unfortunately we can't check if the approver is part of the CODEOWNERS. This is a subset of aws/aws-crypto-tools-team # to add more allowlisted approvers just modify this env variable - maintainers: seebees, texastony, ShubhamChaturvedi7, lucasmcdonald3, josecorella, rishav-karanjit, antonf-amzn, kessplas + maintainers: ShubhamChaturvedi7, lucasmcdonald3, josecorella, rishav-karanjit, antonf-amzn, kessplas, sharmabikram steps: - uses: actions/checkout@v6 with: diff --git a/.github/workflows/ci_codegen.yml b/.github/workflows/ci_codegen.yml index daf6ff241e..e50d7b7f73 100644 --- a/.github/workflows/ci_codegen.yml +++ b/.github/workflows/ci_codegen.yml @@ -73,7 +73,9 @@ jobs: java-version: "17" - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - uses: ./.github/actions/polymorph_codegen with: diff --git a/.github/workflows/ci_examples_java.yml b/.github/workflows/ci_examples_java.yml index 678d71c5a7..00ebf1ee78 100644 --- a/.github/workflows/ci_examples_java.yml +++ b/.github/workflows/ci_examples_java.yml @@ -87,7 +87,9 @@ jobs: sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/ci_examples_net.yml b/.github/workflows/ci_examples_net.yml index 835b2b2492..9d27f878e4 100644 --- a/.github/workflows/ci_examples_net.yml +++ b/.github/workflows/ci_examples_net.yml @@ -72,7 +72,9 @@ jobs: git rev-parse HEAD - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/ci_test_go.yml b/.github/workflows/ci_test_go.yml index 836baa6c0f..019bf2773d 100644 --- a/.github/workflows/ci_test_go.yml +++ b/.github/workflows/ci_test_go.yml @@ -120,7 +120,9 @@ jobs: git submodule update --init --recursive submodules/MaterialProviders - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Build ${{ matrix.library }} implementation shell: bash diff --git a/.github/workflows/ci_test_java.yml b/.github/workflows/ci_test_java.yml index 844975db0b..3dca225ada 100644 --- a/.github/workflows/ci_test_java.yml +++ b/.github/workflows/ci_test_java.yml @@ -76,7 +76,9 @@ jobs: sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/ci_test_latest_released_mpl_java.yml b/.github/workflows/ci_test_latest_released_mpl_java.yml index 398c3f136b..0c82f30954 100644 --- a/.github/workflows/ci_test_latest_released_mpl_java.yml +++ b/.github/workflows/ci_test_latest_released_mpl_java.yml @@ -99,7 +99,9 @@ jobs: dafny-version: ${{ inputs.dafny }} - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/ci_test_net.yml b/.github/workflows/ci_test_net.yml index 786ad2b8ed..c6a7f78f04 100644 --- a/.github/workflows/ci_test_net.yml +++ b/.github/workflows/ci_test_net.yml @@ -73,7 +73,9 @@ jobs: git rev-parse HEAD - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/ci_test_vector_java.yml b/.github/workflows/ci_test_vector_java.yml index 3637aae475..8fd4699a42 100644 --- a/.github/workflows/ci_test_vector_java.yml +++ b/.github/workflows/ci_test_vector_java.yml @@ -104,7 +104,9 @@ jobs: sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/ci_test_vector_net.yml b/.github/workflows/ci_test_vector_net.yml index a5d257ccf2..6a885f2bd2 100644 --- a/.github/workflows/ci_test_vector_net.yml +++ b/.github/workflows/ci_test_vector_net.yml @@ -94,7 +94,9 @@ jobs: git rev-parse HEAD - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/dafny_interop_examples_java.yml b/.github/workflows/dafny_interop_examples_java.yml index 398bbb50ff..73f987323d 100644 --- a/.github/workflows/dafny_interop_examples_java.yml +++ b/.github/workflows/dafny_interop_examples_java.yml @@ -60,7 +60,9 @@ jobs: git rev-parse HEAD - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Setup Java 8 uses: actions/setup-java@v5 diff --git a/.github/workflows/dafny_interop_java.yml b/.github/workflows/dafny_interop_java.yml index 6563a9dc02..8f6401e398 100644 --- a/.github/workflows/dafny_interop_java.yml +++ b/.github/workflows/dafny_interop_java.yml @@ -60,7 +60,9 @@ jobs: git rev-parse HEAD - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Setup Java 8 uses: actions/setup-java@v5 diff --git a/.github/workflows/dafny_interop_test_vector_java.yml b/.github/workflows/dafny_interop_test_vector_java.yml index 39911c1652..0f6bda1451 100644 --- a/.github/workflows/dafny_interop_test_vector_java.yml +++ b/.github/workflows/dafny_interop_test_vector_java.yml @@ -69,7 +69,9 @@ jobs: git rev-parse HEAD - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Setup Java ${{ matrix.java-version }} uses: actions/setup-java@v5 diff --git a/.github/workflows/go-release.yml b/.github/workflows/go-release.yml index dec6df60b3..7fe0016842 100644 --- a/.github/workflows/go-release.yml +++ b/.github/workflows/go-release.yml @@ -57,7 +57,9 @@ jobs: dafny-version: ${{ needs.get-dafny-version.outputs.version }} - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Configure Git run: | diff --git a/.github/workflows/library_dafny_verification.yml b/.github/workflows/library_dafny_verification.yml index d777a1dd82..68fb327fbb 100644 --- a/.github/workflows/library_dafny_verification.yml +++ b/.github/workflows/library_dafny_verification.yml @@ -88,7 +88,9 @@ jobs: dotnet-version: "6.0.x" - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/.github/workflows/library_rust_tests.yml b/.github/workflows/library_rust_tests.yml index be12f15234..23f08af730 100644 --- a/.github/workflows/library_rust_tests.yml +++ b/.github/workflows/library_rust_tests.yml @@ -115,7 +115,9 @@ jobs: uses: ilammy/setup-nasm@v1 - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Run make polymorph_rust shell: bash diff --git a/.github/workflows/performance-benchmarks-go.yml b/.github/workflows/performance-benchmarks-go.yml index cdb4a303f4..172ec055dd 100644 --- a/.github/workflows/performance-benchmarks-go.yml +++ b/.github/workflows/performance-benchmarks-go.yml @@ -91,7 +91,9 @@ jobs: dafny-version: "4.9.0" - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Build ${{ matrix.library }} implementation shell: bash diff --git a/.github/workflows/performance-benchmarks-rust.yml b/.github/workflows/performance-benchmarks-rust.yml index d7c845a284..e8d445a28f 100644 --- a/.github/workflows/performance-benchmarks-rust.yml +++ b/.github/workflows/performance-benchmarks-rust.yml @@ -83,7 +83,9 @@ jobs: java-version: "17" - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Run make polymorph_rust shell: bash diff --git a/.github/workflows/test_vector_verification.yml b/.github/workflows/test_vector_verification.yml index d26861c6a1..ec760c54a5 100644 --- a/.github/workflows/test_vector_verification.yml +++ b/.github/workflows/test_vector_verification.yml @@ -78,7 +78,9 @@ jobs: dotnet-version: "6.0.x" - name: Install Smithy-Dafny codegen dependencies - uses: ./.github/actions/install_smithy_dafny_codegen_dependencies + uses: ./submodules/MaterialProviders/.github/actions/install_smithy_dafny_codegen_dependencies + with: + mpl-submodule-path: ./submodules/MaterialProviders/ - name: Regenerate code using smithy-dafny if necessary if: ${{ inputs.regenerate-code }} diff --git a/submodules/MaterialProviders b/submodules/MaterialProviders index b09e0d44e4..f4beb38037 160000 --- a/submodules/MaterialProviders +++ b/submodules/MaterialProviders @@ -1 +1 @@ -Subproject commit b09e0d44e46182548c41c4150648a3ce75f0c731 +Subproject commit f4beb3803744c588b9f868401901a8180e01a717