Skip to content

Commit 1ed2565

Browse files
committed
no codegen for mpl head tests
1 parent 3213879 commit 1ed2565

File tree

4 files changed

+18
-24
lines changed

4 files changed

+18
-24
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ runs:
2121
git checkout main
2222
git pull
2323
git submodule update --init --recursive
24-
24+
2525
- name: Get the MPL version from the MPL submodule
2626
id: read_property
2727
uses: christian-draeger/[email protected]
2828
with:
29-
path: "submodules/MaterialProviders//project.properties"
29+
path: "submodules/MaterialProviders/project.properties"
3030
properties: "mplVersion"
3131

3232
- name: Update top-level project.properties file
3333
shell: bash
3434
run: |
35-
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{steps.read_property.outputs.mplVersion}}/g" project.properties > project.properties2; mv project.properties2 project.properties
35+
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{steps.read_property.outputs.mplVersion}}/g" project.properties > project.properties2; mv project.properties2 project.properties

.github/workflows/ci_codegen.yml

-11
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ on:
77
description: "The dafny version to run"
88
required: true
99
type: string
10-
mpl-head:
11-
description: "Using MPL HEAD"
12-
required: false
13-
default: false
14-
type: boolean
1510

1611
jobs:
1712
code-generation:
@@ -39,12 +34,6 @@ jobs:
3934
with:
4035
submodules: recursive
4136

42-
- uses: ./.github/actions/mpl-head
43-
if: ${{ inputs.mpl-head == true }}
44-
with:
45-
dafny: ${{ env.DAFNY_VERSION }}
46-
update-and-regenerate-mpl: true
47-
4837
# Only used to format generated code
4938
# and to translate version strings such as "nightly-latest"
5039
# to an actual DAFNY_VERSION.

.github/workflows/library_dafny_verification.yml

+11
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@ on:
1313
required: false
1414
default: false
1515
type: boolean
16+
mpl-head:
17+
description: "Using MPL HEAD"
18+
required: false
19+
default: false
20+
type: boolean
1621

1722
jobs:
1823
verification:
@@ -47,6 +52,12 @@ jobs:
4752
with:
4853
dafny-version: ${{ inputs.dafny }}
4954

55+
- uses: ./.github/actions/mpl-head
56+
if: ${{ inputs.mpl-head == true }}
57+
with:
58+
dafny: ${{ env.DAFNY_VERSION }}
59+
update-and-regenerate-mpl: true
60+
5061
# dafny-reportgenerator requires next6
5162
# but only 7.0 is installed on macos-12-large
5263
- name: Setup .NET Core SDK '6.0.x'

.github/workflows/mpl-head.yml

+4-10
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,13 @@ jobs:
1818
uses: ./.github/workflows/library_format.yml
1919
with:
2020
dafny: ${{needs.getVersion.outputs.version}}
21-
mpl-head-ci-codegen:
22-
needs: getVersion
21+
mpl-head-ci-verification:
22+
needs: getVerifyVersion
2323
if: github.event_name != 'schedule' || github.repository_owner == 'aws'
24-
uses: ./.github/workflows/ci_codegen.yml
24+
uses: ./.github/workflows/library_dafny_verification.yml
2525
with:
26-
dafny: ${{needs.getVersion.outputs.version}}
26+
dafny: ${{needs.getVerifyVersion.outputs.version}}
2727
mpl-head: true
28-
# mpl-head-ci-verification:
29-
# needs: getVerifyVersion
30-
# if: github.event_name != 'schedule' || github.repository_owner == 'aws'
31-
# uses: ./.github/workflows/library_dafny_verification.yml
32-
# with:
33-
# dafny: ${{needs.getVerifyVersion.outputs.version}}
3428
# mpl-head-ci-test-vector-verification:
3529
# needs: getVerifyVersion
3630
# uses: ./.github/workflows/test_vector_verification.yml

0 commit comments

Comments
 (0)