Merge branch 'main' into singleton-keyvectors

Author: lucasmcdonald3

.github/workflows/ci_todos.yml

@@ -17,8 +17,8 @@ jobs:
         shell: bash
         # TODOs may be committed as long as the same line contains a link to a Github Issue or refers to a CrypTool SIM.
         run: |
-          ALL_TODO_COUNT=$( { grep -r "TODO" . --exclude-dir=./TestVectors/runtimes --exclude-dir=./submodules --exclude-dir=./.git --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
-          GOOD_TODO_COUNT=$( { grep -r "TODO.*\(github.com\/.*issues.*\/[1-9][0-9]*\|CrypTool-[1-9][0-9]*\)" . --exclude-dir=./submodules --exclude-dir=./.git  --exclude-dir=./TestVectors/runtimes --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
+          ALL_TODO_COUNT=$( { grep -r "TODO" . --exclude-dir=./releases --exclude-dir=./TestVectors/runtimes --exclude-dir=./submodules --exclude-dir=./.git --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
+          GOOD_TODO_COUNT=$( { grep -r "TODO.*\(github.com\/.*issues.*\/[1-9][0-9]*\|CrypTool-[1-9][0-9]*\)" . --exclude-dir=./releases --exclude-dir=./submodules --exclude-dir=./.git  --exclude-dir=./TestVectors/runtimes --exclude=./.github/workflows/ci_todos.yml || true; } | wc -l)
           if [ "$ALL_TODO_COUNT" != "$GOOD_TODO_COUNT" ]; then
             exit 1;
           fi

.github/workflows/dafny_interop_examples_java.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/dafny_interop_examples_net.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/dafny_interop_java.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/dafny_interop_test_net.yml

@@ -56,7 +56,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/dafny_interop_test_vector_java.yml

@@ -65,7 +65,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/dafny_interop_test_vector_net.yml

@@ -61,7 +61,6 @@ jobs:
         run: |
           git fetch
           git checkout ${{inputs.mpl-commit}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/library_rust_tests.yml

@@ -13,6 +13,11 @@ on:
         required: false
         default: false
         type: boolean
+      mpl-head:
+        description: "Running on MPL HEAD"
+        required: false
+        default: false
+        type: boolean
 
 jobs:
   testRust:
@@ -27,7 +32,7 @@ jobs:
       id-token: write
       contents: read
     env:
-      RUST_MIN_STACK: 404857600
+      RUST_MIN_STACK: 838860800
     steps:
       - name: Support longpaths on Git checkout
         run: |
@@ -50,24 +55,20 @@ jobs:
         uses: actions-rust-lang/[email protected]
         with:
           components: rustfmt
-      # uncomment this after Rust formatter works
-      # - name: Rustfmt Check
-      #   uses: actions-rust-lang/rustfmt@v1
 
       - name: Setup Dafny
-        uses: dafny-lang/setup-dafny-action@v1.7.0
+        uses: dafny-lang/setup-dafny-action@v1.8.0
         with:
-          dafny-version: nightly-2024-12-03-4954170
+          dafny-version: nightly-2025-01-30-7db1e5f
 
-      # Remove this after the formatting in Rust starts working
-      - name: smithy-dafny Rust hacks
-        shell: bash
+      - name: Update MPL submodule if using MPL HEAD
+        if: ${{ inputs.mpl-head == true }}
+        working-directory: submodules/MaterialProviders
         run: |
-          if [ "$RUNNER_OS" == "macOS" ]; then
-            sed -i '' 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' submodules/smithy-dafny/SmithyDafnyMakefile.mk
-          else
-            sed -i 's|rustfmt --edition 2021 runtimes/rust/src/implementation_from_dafny.rs|#&|' submodules/smithy-dafny/SmithyDafnyMakefile.mk
-          fi
+          git checkout main
+          git pull
+          git submodule update --init --recursive
+          git rev-parse HEAD
 
       - name: Setup Java 17 for codegen
         uses: actions/setup-java@v3
@@ -109,6 +110,13 @@ jobs:
         run: |
           make test_rust
 
+      - name: Test ${{ matrix.library }} Rust Debug
+        if: ${{ matrix.library != 'TestVectors' }}
+        shell: bash
+        working-directory: ./${{ matrix.library }}
+        run: |
+          make test_rust test_rust_debug
+
       - name: Test Examples for Rust in ${{ matrix.library }}
         if: ${{ matrix.library == 'DynamoDbEncryption' }}
         working-directory: ./${{ matrix.library }}/runtimes/rust/

.github/workflows/mpl_head_version.yml

@@ -31,7 +31,6 @@ jobs:
         shell: bash
         run: |
           git checkout ${{inputs.mpl-head}}
-          git pull
           git submodule update --init --recursive
           git rev-parse HEAD
 

.github/workflows/smithy-diff.yml

@@ -35,7 +35,7 @@ jobs:
           FILES: ${{ steps.file-changes.outputs.FILES }}
         if: ${{env.FILES != ''}}
         run: |
-          # TODO: If https://github.com/smithy-lang/smithy-dafny/issues/491 is resolved, remove comment about this issue.
+          # If https://github.com/smithy-lang/smithy-dafny/issues/491 is resolved, remove comment about this issue.
           COMMENT="@${{github.event.pull_request.user.login}} and @${{github.actor}}, I noticed you are updating the smithy model files.\nDoes this update need new or updated javadoc trait documentation?\n Are you adding constraints inside list, map or union? Do you know about this issue: https://github.com/smithy-lang/smithy-dafny/issues/491?"
           COMMENT_URL="https://api.github.com/repos/${{ github.repository }}/issues/${PR_NUMBER}/comments"
           curl -s -H "Authorization: token ${GITHUB_TOKEN}" -X POST $COMMENT_URL -d "{\"body\":\"$COMMENT\"}"