@@ -50,48 +50,46 @@ jobs:
5050 distribution : " corretto"
5151 java-version : ${{ matrix.java-version }}
5252
53- # - name: Setup Dafny
54- # uses: dafny-lang/setup-dafny-action@v1.8.0
55- # with:
56- # dafny-version: ${{ needs.getVersion.outputs.version }}
53+ - name : Setup Dafny
54+ uses : dafny-lang/setup-dafny-action@v1.8.0
55+ with :
56+ dafny-version : ${{ needs.getVersion.outputs.version }}
5757
58- # - name: Regenerate code using smithy-dafny if necessary
59- # if: ${{ inputs.regenerate-code }}
60- # uses: ./.github/actions/polymorph_codegen
61- # with:
62- # dafny: ${{ env.DAFNY_VERSION }}
63- # library: DynamoDbEncryption
64- # diff-generated-code: false
65- # update-and-regenerate-mpl: true
58+ - name : Regenerate code using smithy-dafny if necessary
59+ if : ${{ inputs.regenerate-code }}
60+ uses : ./.github/actions/polymorph_codegen
61+ with :
62+ dafny : ${{ env.DAFNY_VERSION }}
63+ library : DynamoDbEncryption
64+ diff-generated-code : false
65+ update-and-regenerate-mpl : true
6666
6767 # The following two steps: "Build and deploy to maven local" and "Run Extensive Tests"
6868 # mimic the tests in ./codebuild/staging/release-staging.yml
69- # - name: Build and deploy to maven local
70- # shell: bash
71- # working-directory: ./DynamoDbEncryption
72- # run: |
73- # # Run transpile by itself. We don't want to locally build the MPL because
74- # # we want to verify that the version pulled down from maven works correctly
75- # make transpile_implementation_java
76- # make transpile_test_java
77- # make mvn_local_deploy
78- # make test_java
69+ - name : Build and deploy to maven local
70+ shell : bash
71+ working-directory : ./DynamoDbEncryption
72+ run : |
73+ # Run transpile by itself. We don't want to locally build the MPL because
74+ # we want to verify that the version pulled down from maven works correctly
75+ make transpile_implementation_java
76+ make transpile_test_java
77+ make mvn_local_deploy
78+ make test_java
7979
80- # - name: Run Extensive Tests
81- # working-directory: ./DynamoDbEncryption
82- # run: |
83- # gradle -p runtimes/java clean
84- # gradle -p runtimes/java test
80+ - name : Run Extensive Tests
81+ working-directory : ./DynamoDbEncryption
82+ run : |
83+ gradle -p runtimes/java clean
84+ gradle -p runtimes/java test
8585
8686 # This makes sure that we are using the correct MPL version to test the DB-ESDK.
8787 # If this contains a SNAPSHOT version, this will fail because'
8888 # we are NOT building the MPL recursively but pulling from Maven.
8989 - name : Update project.properties to use the correct MPL version (from project.properties in DB-ESDK)
9090 working-directory : ./submodules/MaterialProviders/
9191 run : |
92- cat project.properties
9392 sed "s/mplVersion=.*/mplVersion=${{needs.getMplDependencyJavaVersion.outputs.version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
94- cat project.properties
9593
9694 # The following three steps: "Transpile MPL Test Vectors without recursively building the MPL",
9795 # "Run Test Vectors", and "Test Examples" mimic the tests in ./codebuild/staging/validate-staging.yml
10098 run : |
10199 # Run transpile by itself. We don't want to locally build the MPL because
102100 # we want to verify that the version pulled down from maven works correctly
103- cat ../project.properties
104101 make transpile_implementation_java
105102 make transpile_test_java
106103 make mvn_local_deploy
0 commit comments