Skip to content

Commit dc1a1d1

Browse files
author
Lucas McDonald
committed
Merge branch 'main' into python-poc
2 parents 4b5294d + 97fe459 commit dc1a1d1

11 files changed

+34
-20
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: submodules/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 submodules/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: submodules/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 submodules/MaterialProviders/StandardLibrary setup_net

.github/workflows/ci_codegen.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,6 @@ jobs:
6060
- name: Install Smithy-Dafny codegen dependencies
6161
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
6262

63-
- name: Install Smithy-Dafny codegen dependencies
64-
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
65-
6663
- uses: ./.github/actions/polymorph_codegen
6764
with:
6865
dafny: ${{ inputs.dafny }}

.github/workflows/ci_examples_java.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@ jobs:
7272
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
7373
7474
- name: Install Smithy-Dafny codegen dependencies
75-
if: ${{ inputs.regenerate-code }}
7675
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7776

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

.github/workflows/ci_examples_net.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ jobs:
6060
git rev-parse HEAD
6161
6262
- name: Install Smithy-Dafny codegen dependencies
63-
if: ${{ inputs.regenerate-code }}
6463
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
6564

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

.github/workflows/ci_test_java.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ jobs:
6666
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
6767
6868
- name: Install Smithy-Dafny codegen dependencies
69-
if: ${{ inputs.regenerate-code }}
7069
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7170

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

.github/workflows/ci_test_latest_released_mpl_java.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ jobs:
5959
dafny-version: ${{ needs.getVersion.outputs.version }}
6060

6161
- name: Install Smithy-Dafny codegen dependencies
62-
if: ${{ inputs.regenerate-code }}
6362
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
6463

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

.github/workflows/ci_test_net.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ jobs:
6161
git rev-parse HEAD
6262
6363
- name: Install Smithy-Dafny codegen dependencies
64-
if: ${{ inputs.regenerate-code }}
6564
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
6665

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

.github/workflows/ci_test_vector_java.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ jobs:
8080
sed "s/mplDependencyJavaVersion=.*/mplDependencyJavaVersion=${{inputs.mpl-version}}/g" project.properties > project.properties2; mv project.properties2 project.properties
8181
8282
- name: Install Smithy-Dafny codegen dependencies
83-
if: ${{ inputs.regenerate-code }}
8483
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
8584

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

.github/workflows/ci_test_vector_net.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ jobs:
7171
git rev-parse HEAD
7272
7373
- name: Install Smithy-Dafny codegen dependencies
74-
if: ${{ inputs.regenerate-code }}
7574
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7675

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

.github/workflows/library_dafny_verification.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ jobs:
7979
dotnet-version: "6.0.x"
8080

8181
- name: Install Smithy-Dafny codegen dependencies
82-
if: ${{ inputs.regenerate-code }}
8382
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
8483

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

.github/workflows/test_vector_verification.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
dotnet-version: "6.0.x"
7070

7171
- name: Install Smithy-Dafny codegen dependencies
72-
if: ${{ inputs.regenerate-code }}
7372
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7473

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

0 commit comments

Comments
 (0)