@@ -70,43 +70,43 @@ jobs:
7070 diff-generated-code : false
7171 update-and-regenerate-mpl : true
7272
73- # # The following two steps: "Build and deploy to maven local" and "Run Extensive Tests"
74- # # mimic the tests in ./codebuild/staging/release-staging.yml
75- # - name: Build and deploy to maven local
76- # shell: bash
77- # working-directory: ./DynamoDbEncryption
78- # run: |
79- # # Run transpile by itself. We don't want to locally build the MPL because
80- # # we want to verify that the version pulled down from maven works correctly
81- # make transpile_implementation_java
82- # make transpile_test_java
83- # make mvn_local_deploy
84- # make test_java
73+ # The following two steps: "Build and deploy to maven local" and "Run Extensive Tests"
74+ # mimic the tests in ./codebuild/staging/release-staging.yml
75+ - name : Build and deploy to maven local
76+ shell : bash
77+ working-directory : ./DynamoDbEncryption
78+ run : |
79+ # Run transpile by itself. We don't want to locally build the MPL because
80+ # we want to verify that the version pulled down from maven works correctly
81+ make transpile_implementation_java
82+ make transpile_test_java
83+ make mvn_local_deploy
84+ make test_java
8585
86- # - name: Run Extensive Tests
87- # working-directory: ./DynamoDbEncryption
88- # run: |
89- # gradle -p runtimes/java clean
90- # gradle -p runtimes/java test
86+ - name : Run Extensive Tests
87+ working-directory : ./DynamoDbEncryption
88+ run : |
89+ gradle -p runtimes/java clean
90+ gradle -p runtimes/java test
9191
92- # # This makes sure that we are using the correct MPL version to test the DB-ESDK.
93- # # If this contains a SNAPSHOT version, this will fail because'
94- # # we are NOT building the MPL recursively but pulling from Maven.
95- # - name: Update project.properties to use the correct MPL version (from project.properties in DB-ESDK)
96- # working-directory: ./submodules/MaterialProviders/
97- # run: |
98- # sed "s/mplVersion=.*/mplVersion=${{needs.getMplDependencyJavaVersion.outputs.version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
92+ # This makes sure that we are using the correct MPL version to test the DB-ESDK.
93+ # If this contains a SNAPSHOT version, this will fail because'
94+ # we are NOT building the MPL recursively but pulling from Maven.
95+ - name : Update project.properties to use the correct MPL version (from project.properties in DB-ESDK)
96+ working-directory : ./submodules/MaterialProviders/
97+ run : |
98+ sed "s/mplVersion=.*/mplVersion=${{needs.getMplDependencyJavaVersion.outputs.version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
9999
100- # # The following three steps: "Transpile MPL Test Vectors without recursively building the MPL",
101- # # "Run Test Vectors", and "Test Examples" mimic the tests in ./codebuild/staging/validate-staging.yml
102- # - name: Transpile MPL Test Vectors without recursively building the MPL
103- # working-directory: ./submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders
104- # run: |
105- # # Run transpile by itself. We don't want to locally build the MPL because
106- # # we want to verify that the version pulled down from maven works correctly
107- # make transpile_implementation_java
108- # make transpile_test_java
109- # make mvn_local_deploy
100+ # The following three steps: "Transpile MPL Test Vectors without recursively building the MPL",
101+ # "Run Test Vectors", and "Test Examples" mimic the tests in ./codebuild/staging/validate-staging.yml
102+ - name : Transpile MPL Test Vectors without recursively building the MPL
103+ working-directory : ./submodules/MaterialProviders/TestVectorsAwsCryptographicMaterialProviders
104+ run : |
105+ # Run transpile by itself. We don't want to locally build the MPL because
106+ # we want to verify that the version pulled down from maven works correctly
107+ make transpile_implementation_java
108+ make transpile_test_java
109+ make mvn_local_deploy
110110
111111 - name : Run Test Vectors
112112 # TODO: Remove pull_request from here
0 commit comments