Skip to content

Commit 5cff0c4

Browse files
authored
fix ep20 refs in GH workflows (#2218)
1 parent 26bf48f commit 5cff0c4

File tree

2 files changed

+6
-55
lines changed

2 files changed

+6
-55
lines changed

.github/workflows/go.yml

+4-42
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,6 @@ jobs:
2323
go-version: [1.19, "1.20"]
2424
steps:
2525
- uses: actions/checkout@v2
26-
with:
27-
path: aws-sdk-go-v2
28-
29-
- name: Checkout smithy-go
30-
uses: actions/checkout@v2
31-
with:
32-
repository: aws/smithy-go
33-
path: smithy-go
34-
ref: ep20
3526

3627
- name: Set up Go
3728
uses: actions/setup-go@v2
@@ -42,7 +33,7 @@ jobs:
4233
run: go install golang.org/x/lint/golint@latest
4334

4435
- name: Test
45-
run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. ci-test-no-generate
36+
run: make ci-test-no-generate
4637

4738
deprecated-unix-tests:
4839
needs: unix-tests
@@ -59,23 +50,14 @@ jobs:
5950
go-version: 1.16
6051
steps:
6152
- uses: actions/checkout@v2
62-
with:
63-
path: aws-sdk-go-v2
64-
65-
- name: Checkout smithy-go
66-
uses: actions/checkout@v2
67-
with:
68-
repository: aws/smithy-go
69-
path: smithy-go
70-
ref: ep20
7153

7254
- name: Set up Go
7355
uses: actions/setup-go@v2
7456
with:
7557
go-version: ${{ matrix.go-version }}
7658

7759
- name: Test
78-
run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. ci-test-no-generate
60+
run: make ci-test-no-generate
7961

8062
windows-tests:
8163
name: Windows SDK Tests
@@ -86,26 +68,16 @@ jobs:
8668
go-version: [1.19, "1.20"]
8769
env:
8870
EACHMODULE_SKIP: "internal\\repotools\\changes"
89-
SMITHY_GO_SRC: ${{ github.workspace }}/smithy-go
9071
steps:
9172
- uses: actions/checkout@v2
92-
with:
93-
path: aws-sdk-go-v2
94-
95-
- name: Checkout smithy-go
96-
uses: actions/checkout@v2
97-
with:
98-
repository: aws/smithy-go
99-
path: smithy-go
100-
ref: ep20
10173

10274
- name: Set up Go
10375
uses: actions/setup-go@v2
10476
with:
10577
go-version: ${{ matrix.go-version }}
10678

10779
- name: Test
108-
run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. vet build unit-test
80+
run: make vet build unit-test
10981

11082
deprecated-windows-tests:
11183
needs: windows-tests
@@ -117,23 +89,13 @@ jobs:
11789
go-version: [1.15, 1.16, 1.17, 1.18]
11890
env:
11991
EACHMODULE_SKIP: "internal\\repotools\\changes"
120-
SMITHY_GO_SRC: ${{ github.workspace }}/smithy-go
12192
steps:
12293
- uses: actions/checkout@v2
123-
with:
124-
path: aws-sdk-go-v2
125-
126-
- name: Checkout smithy-go
127-
uses: actions/checkout@v2
128-
with:
129-
repository: aws/smithy-go
130-
path: smithy-go
131-
ref: ep20
13294

13395
- name: Set up Go
13496
uses: actions/setup-go@v2
13597
with:
13698
go-version: ${{ matrix.go-version }}
13799

138100
- name: Test
139-
run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. vet build unit-test
101+
run: make vet build unit-test

.github/workflows/golangci-lint.yml

+2-13
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,8 @@ jobs:
1515
os: [ubuntu-latest] # other options: macos-latest, windows-latest
1616
steps:
1717
- uses: actions/checkout@v2
18-
with:
19-
path: aws-sdk-go-v2
20-
21-
- name: Checkout smithy-go
22-
uses: actions/checkout@v2
23-
with:
24-
repository: aws/smithy-go
25-
path: smithy-go
26-
ref: ep20
27-
2818
- name: golangci-lint
29-
uses: golangci/golangci-lint-action@v3
19+
uses: golangci/golangci-lint-action@v2
3020
with:
3121
# Required: the version of golangci-lint is required and must be
3222
# specified without patch version
@@ -36,6 +26,5 @@ jobs:
3626
args: --version
3727
# Show only new issues if it's a pull request. The default value is `false`.
3828
# only-new-issues: true
39-
4029
- name: run ci linter
41-
run: cd aws-sdk-go-v2 && make gen-mod-replace-smithy-. ci-lint
30+
run: make ci-lint

0 commit comments

Comments
 (0)