Skip to content

Commit ed63f70

Browse files
authored
chore(CI): Partially fix nightly build (#785)
1 parent 3aeddc9 commit ed63f70

File tree

4 files changed

+40
-10
lines changed

4 files changed

+40
-10
lines changed

.github/actions/install_smithy_dafny_codegen_dependencies/action.yml

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,40 @@ description: "Install Java package dependencies required to run Smithy-Dafny cod
88
runs:
99
using: "composite"
1010
steps:
11-
- name: Install smithy-dafny-codegen Rust dependencies locally
12-
uses: gradle/gradle-build-action@v2
11+
- name: Setup Java 17 for codegen
12+
uses: actions/setup-java@v3
1313
with:
14-
arguments: :codegen-client:pTML :codegen-core:pTML :rust-runtime:pTML
15-
build-root-directory: mpl/smithy-dafny/smithy-dafny-codegen-modules/smithy-rs
14+
distribution: "corretto"
15+
java-version: "17"
1616

17-
- name: Install smithy-dafny-codegen Python dependencies locally
18-
uses: gradle/gradle-build-action@v2
17+
- name: Install smithy-dafny-codegen dependencies locally
18+
shell: bash
19+
run: |
20+
make -C mpl/smithy-dafny mvn_local_deploy_polymorph_dependencies
21+
22+
- name: Setup Python, black, and docformatter for code formatting
23+
uses: actions/setup-python@v4
24+
with:
25+
python-version: ${{ matrix.python-version }}
26+
architecture: x64
27+
- shell: bash
28+
run: |
29+
python -m pip install --upgrade pip
30+
python -m pip install --upgrade black
31+
python -m pip install --upgrade docformatter
32+
33+
- name: Install Go
34+
uses: actions/setup-go@v5
1935
with:
20-
arguments: :smithy-python-codegen:pTML
21-
build-root-directory: mpl/smithy-dafny/codegen/smithy-dafny-codegen-modules/smithy-python/codegen
36+
go-version: "1.23"
37+
38+
- name: Install Go imports
39+
shell: bash
40+
run: |
41+
go install golang.org/x/tools/cmd/goimports@latest
42+
43+
# Without this the if-dafny-at-least command includes "Downloading ..." output
44+
- name: Arbitrary makefile target to force downloading Gradle
45+
shell: bash
46+
run: |
47+
make -C mpl/StandardLibrary setup_net

.github/actions/polymorph_codegen/action.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,12 @@ inputs:
5757
runs:
5858
using: "composite"
5959
steps:
60+
- name: Install smithy-dafny dependencies
61+
shell: bash
62+
working-directory: mpl/smithy-dafny
63+
run: |
64+
make mvn_local_deploy_polymorph_dependencies
65+
6066
- name: Update MPL submodule locally if requested
6167
if: inputs.update-and-regenerate-mpl == 'true'
6268
shell: bash

.github/workflows/library_dafny_verification.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ jobs:
4848
dafny-version: ${{ inputs.dafny }}
4949

5050
- name: Install Smithy-Dafny codegen dependencies
51-
if: ${{ inputs.regenerate-code }}
5251
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
5352

5453
- name: Regenerate code using smithy-dafny if necessary

.github/workflows/library_java_tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ jobs:
5454
dafny-version: ${{ inputs.dafny }}
5555

5656
- name: Install Smithy-Dafny codegen dependencies
57-
if: ${{ inputs.regenerate-code }}
5857
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
5958

6059
- name: Regenerate code using smithy-dafny if necessary

0 commit comments

Comments
 (0)