Skip to content

Commit a642c97

Browse files
Merge branch 'mainline' into PerfTests/java
2 parents e856cf1 + ac3448a commit a642c97

File tree

9 files changed

+11
-73
lines changed

9 files changed

+11
-73
lines changed

.github/actions/install_smithy_dafny_codegen_dependencies/action.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,16 @@ runs:
3030
python -m pip install --upgrade black
3131
python -m pip install --upgrade docformatter
3232
33+
- name: Install Go
34+
uses: actions/setup-go@v5
35+
with:
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+
3343
# Without this the if-dafny-at-least command includes "Downloading ..." output
3444
- name: Arbitrary makefile target to force downloading Gradle
3545
shell: bash

.github/workflows/dafny_interop_library_go_tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,6 @@ jobs:
7676
with:
7777
go-version: ${{ matrix.go-version }}
7878

79-
- name: Install Go imports
80-
run: |
81-
go install golang.org/x/tools/cmd/goimports@latest
82-
8379
- name: Compile MPL with Dafny ${{inputs.mpl-dafny}}
8480
shell: bash
8581
working-directory: mpl/TestVectorsAwsCryptographicMaterialProviders

.github/workflows/go-release.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,6 @@ jobs:
5151
with:
5252
dafny-version: ${{ needs.get-dafny-version.outputs.version }}
5353

54-
- name: Install Go
55-
uses: actions/setup-go@v5
56-
with:
57-
go-version: "1.23"
58-
59-
- name: Install Go imports
60-
run: |
61-
go install golang.org/x/tools/cmd/goimports@latest
62-
6354
- name: Install Smithy-Dafny codegen dependencies
6455
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
6556

.github/workflows/library_codegen.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,6 @@ jobs:
6868
with:
6969
go-version: ${{ matrix.go-version }}
7070

71-
- name: Install Go imports
72-
run: |
73-
go install golang.org/x/tools/cmd/goimports@latest
74-
7571
- name: Install Smithy-Dafny codegen dependencies
7672
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7773

.github/workflows/library_go_tests.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,6 @@ jobs:
6767
with:
6868
go-version: ${{ matrix.go-version }}
6969

70-
- name: Install Go imports
71-
run: |
72-
go install golang.org/x/tools/cmd/goimports@latest
73-
7470
- name: Compile ${{ matrix.library }} implementation
7571
shell: bash
7672
working-directory: ${{ matrix.library }}

.github/workflows/library_interop_keyring_test_vectors.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -163,15 +163,6 @@ jobs:
163163
with:
164164
components: rustfmt
165165

166-
- name: Setup Go
167-
uses: actions/setup-go@v5
168-
with:
169-
go-version: "1.23"
170-
171-
- name: Install Go imports
172-
run: |
173-
go install golang.org/x/tools/cmd/goimports@latest
174-
175166
- name: Setup NASM for Windows in Rust (aws-lc-sys)
176167
if: matrix.language == 'rust' && matrix.os == 'windows-latest'
177168
uses: ilammy/setup-nasm@v1
@@ -449,15 +440,6 @@ jobs:
449440
with:
450441
components: rustfmt
451442

452-
- name: Setup Go
453-
uses: actions/setup-go@v5
454-
with:
455-
go-version: "1.23"
456-
457-
- name: Install Go imports
458-
run: |
459-
go install golang.org/x/tools/cmd/goimports@latest
460-
461443
- name: Setup NASM for Windows in Rust (aws-lc-sys)
462444
if: matrix.decrypting_language == 'rust' && matrix.os == 'windows-latest'
463445
uses: ilammy/setup-nasm@v1

.github/workflows/library_interop_mkp_test_vectors.yml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,6 @@ jobs:
103103
with:
104104
components: rustfmt
105105

106-
- name: Setup Go
107-
uses: actions/setup-go@v5
108-
with:
109-
go-version: "1.23"
110-
111-
- name: Install Go imports
112-
run: |
113-
go install golang.org/x/tools/cmd/goimports@latest
114-
115106
- name: Setup NASM for Windows in Rust (aws-lc-sys)
116107
if: matrix.language == 'rust' && matrix.os == 'windows-latest'
117108
uses: ilammy/setup-nasm@v1
@@ -304,15 +295,6 @@ jobs:
304295
with:
305296
components: rustfmt
306297

307-
- name: Setup Go
308-
uses: actions/setup-go@v5
309-
with:
310-
go-version: "1.23"
311-
312-
- name: Install Go imports
313-
run: |
314-
go install golang.org/x/tools/cmd/goimports@latest
315-
316298
- name: Setup NASM for Windows in Rust (aws-lc-sys)
317299
if: matrix.decrypting_language == 'rust' && matrix.os == 'windows-latest'
318300
uses: ilammy/setup-nasm@v1
@@ -737,15 +719,6 @@ jobs:
737719
with:
738720
components: rustfmt
739721

740-
- name: Setup Go
741-
uses: actions/setup-go@v5
742-
with:
743-
go-version: "1.23"
744-
745-
- name: Install Go imports
746-
run: |
747-
go install golang.org/x/tools/cmd/goimports@latest
748-
749722
- name: Setup NASM for Windows in Rust (aws-lc-sys)
750723
if: matrix.decrypting_language == 'rust' && matrix.os == 'windows-latest'
751724
uses: ilammy/setup-nasm@v1

.github/workflows/library_rust_tests.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ jobs:
6868
if: matrix.os == 'windows-latest'
6969
uses: ilammy/setup-nasm@v1
7070

71-
# Go is needed for aws-lc-FIPS
72-
- name: Install Go
73-
uses: actions/setup-go@v5
74-
with:
75-
go-version: ">=1.18"
76-
7771
- name: Install Smithy-Dafny codegen dependencies
7872
uses: ./.github/actions/install_smithy_dafny_codegen_dependencies
7973

mpl

Submodule mpl updated from dc1678a to 2c57523

0 commit comments

Comments
 (0)