chore: merge from main

Author: rishav-karanjit

.github/workflows/ci_codegen.yml

@@ -7,6 +7,11 @@ on:
         description: "The dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
 
 jobs:
   code-generation:
@@ -37,6 +42,7 @@ jobs:
 
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
       - run: git submodule update --init --recursive submodules/smithy-dafny
 

.github/workflows/ci_examples_java.yml

@@ -8,6 +8,11 @@ on:
         description: "The Dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
       regenerate-code:
         description: "Regenerate code using smithy-dafny"
         required: false
@@ -48,6 +53,7 @@ jobs:
 
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
 
       - name: Setup Java 8

.github/workflows/ci_examples_net.yml

@@ -8,6 +8,11 @@ on:
         description: "The Dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
       regenerate-code:
         description: "Regenerate code using smithy-dafny"
         required: false
@@ -38,6 +43,7 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
 
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}

.github/workflows/ci_test_java.yml

@@ -8,6 +8,11 @@ on:
         description: "The Dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
       regenerate-code:
         description: "Regenerate code using smithy-dafny"
         required: false
@@ -49,6 +54,7 @@ jobs:
 
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
 
       - name: Setup Dafny

.github/workflows/ci_test_net.yml

@@ -8,6 +8,11 @@ on:
         description: "The Dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
       regenerate-code:
         description: "Regenerate code using smithy-dafny"
         required: false
@@ -39,6 +44,7 @@ jobs:
           git config --global core.longpaths true
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
 
       - name: Setup .NET Core SDK ${{ matrix.dotnet-version }}

.github/workflows/ci_test_vector_java.yml

@@ -8,6 +8,11 @@ on:
         description: "The Dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
       regenerate-code:
         description: "Regenerate code using smithy-dafny"
         required: false
@@ -60,6 +65,7 @@ jobs:
 
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
 
       - name: Setup Dafny

.github/workflows/ci_test_vector_net.yml

@@ -8,6 +8,11 @@ on:
         description: "The Dafny version to run"
         required: true
         type: string
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
       regenerate-code:
         description: "Regenerate code using smithy-dafny"
         required: false
@@ -55,6 +60,7 @@ jobs:
 
       - uses: actions/checkout@v6
         with:
+          ref: ${{ inputs.branch }}
           submodules: recursive
 
       - name: Setup Dafny

.github/workflows/dafny_verify_version.yml

@@ -5,6 +5,12 @@ name: Dafny Verify Version
 
 on:
   workflow_call:
+    inputs:
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
     outputs:
       version:
         description: "The dafny version for verify"
@@ -21,6 +27,8 @@ jobs:
       version: ${{ steps.read_property.outputs.dafnyVerifyVersion }}
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.branch }}
       - name: Read version from Properties-file
         id: read_property
         uses: christian-draeger/read-properties@1.1.1

.github/workflows/dafny_version.yml

@@ -5,6 +5,12 @@ name: Dafny Version
 
 on:
   workflow_call:
+    inputs:
+      branch:
+        description: "Branch to checkout"
+        required: false
+        default: main
+        type: string
     outputs:
       version:
         description: "The dafny version"
@@ -21,6 +27,8 @@ jobs:
       version: ${{ steps.read_property.outputs.dafnyVersion }}
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{ inputs.branch }}
       - name: Read version from Properties-file
         id: read_property
         uses: christian-draeger/read-properties@1.1.1

.github/workflows/daily_ci.yml

@@ -8,8 +8,7 @@ permissions:
 on:
   schedule:
     - cron: "00 16 * * 1-5"
-  pull_request:
-    paths: .github/workflows/daily_ci.yml
+  workflow_dispatch:
 
 jobs:
   getVersion:
@@ -19,116 +18,170 @@ jobs:
       id-token: write
     # Don't run the cron builds on forks
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/dafny_version.yml
+    with:
+      branch: ${{ matrix.branch }}
   getVerifyVersion:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/dafny_verify_version.yml
+    with:
+      branch: ${{ matrix.branch }}
   daily-ci-format:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/library_format.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-codegen:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_codegen.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-verification:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVerifyVersion
     if: github.event_name != 'schedule' || github.repository_owner == 'aws'
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/library_dafny_verification.yml
     with:
       dafny: ${{needs.getVerifyVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-test-vector-verification:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVerifyVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/test_vector_verification.yml
     with:
       dafny: ${{needs.getVerifyVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-java:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_test_java.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-java-test-vectors:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_test_vector_java.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-java-examples:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_examples_java.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-net:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_test_net.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-rust:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/library_rust_tests.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-net-test-vectors:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_test_vector_net.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   daily-ci-net-examples:
     permissions:
       contents: read
       pull-requests: write
       id-token: write
     needs: getVersion
+    strategy:
+      matrix:
+        branch: [main, v3.x-Java]
     uses: ./.github/workflows/ci_examples_net.yml
     with:
       dafny: ${{needs.getVersion.outputs.version}}
+      branch: ${{ matrix.branch }}
   notify:
     permissions:
       contents: read