better

Author: josecorella

.github/workflows/dafny-interop.yml

@@ -21,23 +21,31 @@ on:
         type: string
 
 jobs:
+  getMplHeadVersion:
+    uses: ./.github/workflows/mpl_head_version.yml
   dafny-interop-java:
+    needs: getMplHeadVersion
     uses: ./.github/workflows/dafny_interop_java.yml
     with:
       mpl-dafny: ${{inputs.mpl-dafny}}
       mpl-commit: ${{inputs.mpl-commit}}
+      mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
       dbesdk-dafny: ${{inputs.dbesdk-dafny}}
   dafny-interop-java-test-vectors:
+    needs: getMplHeadVersion
     uses: ./.github/workflows/dafny_interop_test_vector_java.yml
     with:
       mpl-dafny: ${{inputs.mpl-dafny}}
       mpl-commit: ${{inputs.mpl-commit}}
+      mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
       dbesdk-dafny: ${{inputs.dbesdk-dafny}}
   dafny-interop-java-examples:
+    needs: getMplHeadVersion
     uses: ./.github/workflows/dafny_interop_examples_java.yml
     with:
       mpl-dafny: ${{inputs.mpl-dafny}}
       mpl-commit: ${{inputs.mpl-commit}}
+      mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
       dbesdk-dafny: ${{inputs.dbesdk-dafny}}
   dafny-interop-net:
     uses: ./.github/workflows/dafny_interop_test_net.yml

.github/workflows/dafny_interop_examples_java.yml

@@ -13,6 +13,10 @@ on:
         required: false
         default: "main"
         type: string
+      mpl-version:
+        description: "The MPL version to use"
+        required: true
+        type: string
       dbesdk-dafny:
         description: "The Dafny version to compile the DBESDK with (4.2.0, dafny-nightly, etc..)"
         required: true
@@ -74,6 +78,10 @@ jobs:
         with:
           dafny-version: ${{ inputs.dbesdk-dafny}}
 
+      - name: Update project.properties if using MPL HEAD
+        run: |
+          sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
+
       - name: Build implementation
         shell: bash
         working-directory: ./DynamoDbEncryption

.github/workflows/dafny_interop_java.yml

@@ -13,6 +13,10 @@ on:
         required: false
         default: "main"
         type: string
+      mpl-version:
+        description: "The MPL version to use"
+        required: true
+        type: string
       dbesdk-dafny:
         description: "The Dafny version to compile the DBESDK with (4.2.0, dafny-nightly, etc..)"
         required: true
@@ -74,6 +78,10 @@ jobs:
         with:
           dafny-version: ${{ inputs.dbesdk-dafny}}
 
+      - name: Update project.properties if using MPL HEAD
+        run: |
+          sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
+
       - name: Build ${{ matrix.library }} implementation
         shell: bash
         working-directory: ./${{ matrix.library }}

.github/workflows/dafny_interop_test_vector_java.yml

@@ -13,6 +13,10 @@ on:
         required: false
         default: "main"
         type: string
+      mpl-version:
+        description: "The MPL version to use"
+        required: true
+        type: string
       dbesdk-dafny:
         description: "The Dafny version to compile the DBESDK with (4.2.0, dafny-nightly, etc..)"
         required: true
@@ -84,6 +88,10 @@ jobs:
         with:
           dafny-version: ${{ inputs.dbesdk-dafny}}
 
+      - name: Update project.properties if using MPL HEAD
+        run: |
+          sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
+
       - name: Build DynamoDbEncryption implementation
         shell: bash
         working-directory: DynamoDbEncryption

project.properties

@@ -1,5 +1,5 @@
 projectJavaVersion=3.6.1-SNAPSHOT
-mplDependencyJavaVersion=1.5.1-SNAPSHOT
+mplDependencyJavaVersion=1.5.1
 dafnyVersion=4.2.0
 dafnyVerifyVersion=4.7.0
 dafnyRuntimeJavaVersion=4.2.0