Skip to content

Commit e57354f

Browse files
committed
a
1 parent 7030c57 commit e57354f

File tree

5 files changed

+32
-41
lines changed

5 files changed

+32
-41
lines changed

.github/actions/mpl-head/action.yml

-35
This file was deleted.

.github/workflows/library_dafny_verification.yml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
git checkout main
6464
git pull
6565
git submodule update --init --recursive
66+
git rev-parse HEAD
6667
6768
- name: Update project.properties if using MPL HEAD
6869
if: ${{ inputs.mpl-head == true }}

.github/workflows/mpl-head.yml

+7-6
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,13 @@ jobs:
2929
dafny: ${{needs.getVerifyVersion.outputs.version}}
3030
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
3131
mpl-head: true
32-
# mpl-head-ci-test-vector-verification:
33-
# needs: getVerifyVersion
34-
# uses: ./.github/workflows/test_vector_verification.yml
35-
# with:
36-
# dafny: ${{needs.getVerifyVersion.outputs.version}}
37-
# mpl-head: true
32+
mpl-head-ci-test-vector-verification:
33+
needs: getVerifyVersion
34+
uses: ./.github/workflows/test_vector_verification.yml
35+
with:
36+
dafny: ${{needs.getVerifyVersion.outputs.version}}
37+
mpl-version: ${{needs.getMplHeadVersion.outputs.version}}
38+
mpl-head: true
3839
# mpl-head-ci-java-test-vectors:
3940
# needs: getVersion
4041
# uses: ./.github/workflows/ci_test_vector_java.yml

.github/workflows/mpl_head_version.yml

+1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ jobs:
2626
git checkout main
2727
git pull
2828
git submodule update --init --recursive
29+
git rev-parse HEAD
2930
3031
- name: Get the MPL version from the MPL submodule
3132
id: read_property

.github/workflows/test_vector_verification.yml

+23
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
verification:
@@ -37,6 +46,20 @@ jobs:
3746
uses: dafny-lang/[email protected]
3847
with:
3948
dafny-version: ${{ inputs.dafny }}
49+
50+
- name: Update MPL submodule if using MPL HEAD
51+
if: ${{ inputs.mpl-head == true }}
52+
working-directory: submodules/MaterialProviders
53+
run: |
54+
git checkout main
55+
git pull
56+
git submodule update --init --recursive
57+
git rev-parse HEAD
58+
59+
- name: Update project.properties if using MPL HEAD
60+
if: ${{ inputs.mpl-head == true }}
61+
run: |
62+
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
4063
4164
# dafny-reportgenerator requires next6
4265
# but only 7.0 is installed on macos-12-large

0 commit comments

Comments
 (0)