Skip to content

Commit a9627c0

Browse files
committed
bump mpl; update ci_test_latest_released_mpl_java.yml
1 parent f71f740 commit a9627c0

File tree

4 files changed

+39
-4
lines changed

4 files changed

+39
-4
lines changed

.github/workflows/ci_test_latest_released_mpl_java.yml

+11-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@ jobs:
1818
getVerifyVersion:
1919
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
2020
uses: ./.github/workflows/dafny_verify_version.yml
21+
getMplDependencyJavaVersion:
22+
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
23+
uses: ./.github/workflows/mpl_dependency_java_version.yml
2124
testJava:
22-
needs: getVersion
25+
needs: [getVersion, getMplDependencyJavaVersion]
2326
strategy:
2427
max-parallel: 1
2528
matrix:
@@ -80,6 +83,13 @@ jobs:
8083
gradle -p runtimes/java clean
8184
gradle -p runtimes/java test
8285
86+
# This makes sure that we are using the correct MPL version to test the DB-ESDK.
87+
# If this contains a SNAPSHOT version, this will fail because'
88+
# we are NOT building the MPL recursively but pulling from Maven.
89+
- name: Update project.properties if using MPL HEAD
90+
run: |
91+
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{needs.getMplDependencyJavaVersion.outputs.version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
92+
8393
# The following three steps: "Transpile MPL Test Vectors without recursively building the MPL",
8494
# "Run Test Vectors", and "Test Examples" mimic the tests in ./codebuild/staging/validate-staging.yml
8595
- name: Transpile MPL Test Vectors without recursively building the MPL
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
# This workflow reads the project.properties
2+
# into the environment variables
3+
# and then creates an output variable for `mplDependencyJavaVersion`
4+
name: MPL Dependency Java Version
5+
6+
on:
7+
workflow_call:
8+
outputs:
9+
version:
10+
description: "The MPL Dependency Java version from project.properties"
11+
value: ${{ jobs.getMplDependencyJavaVersion.outputs.version }}
12+
13+
jobs:
14+
getMplDependencyJavaVersion:
15+
runs-on: ubuntu-22.04
16+
outputs:
17+
version: ${{ steps.read_property.outputs.mplVersion }}
18+
steps:
19+
- uses: actions/checkout@v4
20+
- name: Read version from Properties-file
21+
id: read_property
22+
uses: christian-draeger/[email protected]
23+
with:
24+
path: "./project.properties"
25+
properties: "mplDependencyJavaVersion"

.github/workflows/mpl_head_version.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# This workflow reads the project.properties
1+
# This workflow reads the project.properties in the MPL submodule
22
# into the environment variables
3-
# and then creates an output variable for `dafnyVerifyVersion `
3+
# and then creates an output variable for `mplVersion`
44
name: MPL HEAD Version
55

66
on:

0 commit comments

Comments
 (0)