Skip to content

Commit 0397353

Browse files
josecorellajosecorella
committed
check out mpl head for java testing
1 parent e57354f commit 0397353

File tree

6 files changed

+97
-14
lines changed

6 files changed

+97
-14
lines changed

‎.github/workflows/ci_examples_java.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ on:
1313
required: false
1414
default: false
1515
type: boolean
16+
mpl-version:
17+
description: "MPL version to use"
18+
required: false
19+
type: string
20+
mpl-head:
21+
description: "Running on MPL HEAD"
22+
required: false
23+
default: false
24+
type: boolean
1625

1726
jobs:
1827
testJava:
@@ -48,6 +57,20 @@ jobs:
4857
with:
4958
dafny-version: ${{ inputs.dafny }}
5059

60+
- name: Update MPL submodule if using MPL HEAD
61+
if: ${{ inputs.mpl-head == true }}
62+
working-directory: submodules/MaterialProviders
63+
run: |
64+
git checkout main
65+
git pull
66+
git submodule update --init --recursive
67+
git rev-parse HEAD
68+
69+
- name: Update project.properties if using MPL HEAD
70+
if: ${{ inputs.mpl-head == true }}
71+
run: |
72+
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
73+
5174
- name: Regenerate code using smithy-dafny if necessary
5275
if: ${{ inputs.regenerate-code }}
5376
uses: ./.github/actions/polymorph_codegen

‎.github/workflows/ci_test_java.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ on:
1313
required: false
1414
default: false
1515
type: boolean
16+
mpl-version:
17+
description: "MPL version to use"
18+
required: false
19+
type: string
20+
mpl-head:
21+
description: "Running on MPL HEAD"
22+
required: false
23+
default: false
24+
type: boolean
1625

1726
jobs:
1827
testJava:
@@ -42,6 +51,20 @@ jobs:
4251
with:
4352
dafny-version: ${{ inputs.dafny }}
4453

54+
- name: Update MPL submodule if using MPL HEAD
55+
if: ${{ inputs.mpl-head == true }}
56+
working-directory: submodules/MaterialProviders
57+
run: |
58+
git checkout main
59+
git pull
60+
git submodule update --init --recursive
61+
git rev-parse HEAD
62+
63+
- name: Update project.properties if using MPL HEAD
64+
if: ${{ inputs.mpl-head == true }}
65+
run: |
66+
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
67+
4568
- name: Regenerate code using smithy-dafny if necessary
4669
if: ${{ inputs.regenerate-code }}
4770
uses: ./.github/actions/polymorph_codegen

‎.github/workflows/ci_test_vector_java.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,15 @@ on:
1313
required: false
1414
default: false
1515
type: boolean
16+
mpl-version:
17+
description: "MPL version to use"
18+
required: false
19+
type: string
20+
mpl-head:
21+
description: "Running on MPL HEAD"
22+
required: false
23+
default: false
24+
type: boolean
1625

1726
jobs:
1827
testJava:
@@ -51,6 +60,20 @@ jobs:
5160
with:
5261
dafny-version: ${{ inputs.dafny }}
5362

63+
- name: Update MPL submodule if using MPL HEAD
64+
if: ${{ inputs.mpl-head == true }}
65+
working-directory: submodules/MaterialProviders
66+
run: |
67+
git checkout main
68+
git pull
69+
git submodule update --init --recursive
70+
git rev-parse HEAD
71+
72+
- name: Update project.properties if using MPL HEAD
73+
if: ${{ inputs.mpl-head == true }}
74+
run: |
75+
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
76+
5477
- name: Regenerate code using smithy-dafny if necessary
5578
if: ${{ inputs.regenerate-code }}
5679
uses: ./.github/actions/polymorph_codegen

‎.github/workflows/daily_ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@ jobs:
3636
uses: ./.github/workflows/test_vector_verification.yml
3737
with:
3838
dafny: ${{needs.getVerifyVersion.outputs.version}}
39+
daily-ci-java:
40+
needs: getVersion
41+
uses: ./.github/workflows/ci_test_java.yml
42+
with:
43+
dafny: ${{needs.getVersion.outputs.version}}
3944
daily-ci-java-test-vectors:
4045
needs: getVersion
4146
uses: ./.github/workflows/ci_test_vector_java.yml

‎.github/workflows/mpl-head.yml

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,24 +30,33 @@ jobs:
3030
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
3131
mpl-head: true
3232
mpl-head-ci-test-vector-verification:
33-
needs: getVerifyVersion
33+
needs: [getVerifyVersion, getMplHeadVersion]
3434
uses: ./.github/workflows/test_vector_verification.yml
3535
with:
3636
dafny: ${{needs.getVerifyVersion.outputs.version}}
3737
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
3838
mpl-head: true
39-
# mpl-head-ci-java-test-vectors:
40-
# needs: getVersion
41-
# uses: ./.github/workflows/ci_test_vector_java.yml
42-
# with:
43-
# dafny: ${{needs.getVersion.outputs.version}}
44-
# mpl-head: true
45-
# mpl-headci-java-examples:
46-
# needs: getVersion
47-
# uses: ./.github/workflows/ci_examples_java.yml
48-
# with:
49-
# dafny: ${{needs.getVersion.outputs.version}}
50-
# mpl-head: true
39+
mpl-head-ci-java:
40+
needs: [getVersion, getMplHeadVersion]
41+
uses: ./.github/workflows/ci_test_java.yml
42+
with:
43+
dafny: ${{needs.getVersion.outputs.version}}
44+
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
45+
mpl-head: true
46+
mpl-head-ci-java-test-vectors:
47+
needs: [getVersion, getMplHeadVersion]
48+
uses: ./.github/workflows/ci_test_vector_java.yml
49+
with:
50+
dafny: ${{needs.getVersion.outputs.version}}
51+
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
52+
mpl-head: true
53+
mpl-headci-java-examples:
54+
needs: [getVersion, getMplHeadVersion]
55+
uses: ./.github/workflows/ci_examples_java.yml
56+
with:
57+
dafny: ${{needs.getVersion.outputs.version}}
58+
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
59+
mpl-head: true
5160
# mpl-head-ci-net:
5261
# needs: getVersion
5362
# uses: ./.github/workflows/ci_test_net.yml

‎.github/workflows/test_vector_verification.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
uses: dafny-lang/[email protected]
4747
with:
4848
dafny-version: ${{ inputs.dafny }}
49-
49+
5050
- name: Update MPL submodule if using MPL HEAD
5151
if: ${{ inputs.mpl-head == true }}
5252
working-directory: submodules/MaterialProviders

0 commit comments

Comments
 (0)