Skip to content

Commit 4ed4962

Browse files
authored
Merge branch 'main' into ship-3971-remove-ws-dep-client
2 parents 2cbc024 + fee259e commit 4ed4962

36 files changed

+2666
-17
lines changed

.github/workflows/docker-test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
go test -timeout 20m -json -parallel 2 -cover -covermode=atomic -coverprofile=unit-test-coverage.out $(go list ./... | grep /docker/test_env) -run '${{ matrix.test.tests }}' 2>&1 | tee /tmp/gotest.log | ../gotestloghelper -ci
4747
- name: Publish Artifacts
4848
if: failure()
49-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
49+
uses: actions/upload-artifact@v4
5050
with:
5151
name: test-logs
5252
path: ./lib/logs

.github/workflows/framework-golden-tests.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
config: smoke.toml
2323
count: 1
2424
timeout: 10m
25-
- name: TestSmoke
25+
- name: TestSmokeLimitedResources
2626
config: smoke_limited_resources.toml
2727
count: 1
2828
timeout: 10m
@@ -81,9 +81,9 @@ jobs:
8181
- 'framework/**'
8282
- '.github/workflows/framework-golden-tests.yml'
8383
- name: Set up Go
84-
uses: actions/setup-go@v4
84+
uses: actions/setup-go@v5
8585
with:
86-
go-version: 1.22.8
86+
go-version: 1.23
8787
- name: Cache Go modules
8888
uses: actions/cache@v3
8989
with:
@@ -104,7 +104,7 @@ jobs:
104104
go test -timeout ${{ matrix.test.timeout }} -v -count ${{ matrix.test.count }} -run ${{ matrix.test.name }}
105105
- name: Upload Logs
106106
if: always()
107-
uses: actions/upload-artifact@v3
107+
uses: actions/upload-artifact@v4
108108
with:
109109
name: container-logs-${{ matrix.test.name }}
110110
path: framework/examples/myproject/logs

.github/workflows/framework.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ jobs:
3636
src:
3737
- 'framework/**'
3838
- name: Set up Go
39-
uses: actions/setup-go@v4
39+
uses: actions/setup-go@v5
4040
with:
41-
go-version: 1.22.8
41+
go-version: 1.23
4242
- name: Cache Go modules
4343
uses: actions/cache@v4
4444
with:

.github/workflows/generate-go-docs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
rm filtered_folders.json
124124
125125
- name: Upload costs as artifact
126-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
126+
uses: actions/upload-artifact@v4
127127
with:
128128
name: generation-costs
129129
path: ./costs

.github/workflows/k8s-e2e.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ jobs:
9898
QA_AWS_ROLE_TO_ASSUME: ${{ secrets.QA_AWS_ROLE_TO_ASSUME }}
9999
run_setup: false
100100
- name: Upload test log
101-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
101+
uses: actions/upload-artifact@v4
102102
if: failure()
103103
with:
104104
name: test-log
@@ -146,7 +146,7 @@ jobs:
146146
QA_KUBECONFIG: ${{ secrets.QA_KUBECONFIG }}
147147
run_setup: false
148148
- name: Upload test log
149-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
149+
uses: actions/upload-artifact@v4
150150
if: failure()
151151
with:
152152
name: remote-runner-test-log

.github/workflows/lint.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ jobs:
7676
path: ./tools/asciitable/
7777
- name: workflowresultparser
7878
path: ./tools/workflowresultparser/
79+
- name: parrot
80+
path: ./parrot/
7981
steps:
8082
- name: Check out Code
8183
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
@@ -98,7 +100,7 @@ jobs:
98100
run: test -f ${{ matrix.project.path }}golangci-lint-report.xml || true
99101
- name: Store lint report artifact
100102
if: always()
101-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
103+
uses: actions/upload-artifact@v4
102104
with:
103105
name: golangci-lint-report-${{ matrix.project.name }}
104106
path: ${{ matrix.project.path }}golangci-lint-report.xml
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
name: Parrot Release
2+
3+
on:
4+
push:
5+
tags:
6+
- parrot/v*
7+
8+
jobs:
9+
release:
10+
name: Build and Release
11+
runs-on: ubuntu-latest
12+
environment: integration
13+
permissions:
14+
id-token: write
15+
contents: write
16+
steps:
17+
- name: Checkout repo
18+
uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
19+
with:
20+
fetch-depth: 0
21+
- name: Configure AWS Credentials
22+
uses: aws-actions/configure-aws-credentials@e3dd6a429d7300a6a4c196c26e071d42e0343502 # v4.0.2
23+
with:
24+
aws-region: ${{ secrets.AWS_REGION }}
25+
role-to-assume: ${{ secrets.AWS_OIDC_PUBLISH_ECR_ROLE_ARN }}
26+
role-duration-seconds: 1800
27+
mask-aws-account-id: true
28+
- name: Login to Amazon ECR
29+
uses: aws-actions/amazon-ecr-login@062b18b96a7aff071d4dc91bc00c4c1a7945b076 # v2.0.1
30+
with:
31+
mask-password: 'true'
32+
env:
33+
AWS_REGION: ${{ secrets.AWS_REGION }}
34+
- name: Set up Go
35+
uses: actions/setup-go@v5
36+
with:
37+
go-version: stable
38+
- name: Goreleaser Release
39+
uses: goreleaser/goreleaser-action@v6
40+
with:
41+
distribution: goreleaser-pro
42+
version: "~> v2"
43+
args: release --clean -f ./parrot/.goreleaser.yaml
44+
env:
45+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
46+
GORELEASER_KEY: ${{ secrets.GORELEASER_KEY }}
47+
IMAGE_PREFIX: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}.dkr.ecr.${{ secrets.AWS_REGION }}.amazonaws.com
48+
IMAGE_TAG: ${{ github.ref_name}}

.github/workflows/rc-breaking-changes.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ jobs:
1616
with:
1717
fetch-depth: 0
1818
fetch-tags: true
19-
- name: Set up Go 1.23.3
19+
- name: Set up Go
2020
uses: actions/setup-go@v5
2121
with:
22-
go-version: '1.23.3'
22+
go-version: 1.23
2323
- name: Install gorelease tool
2424
run: |
2525
go install golang.org/x/exp/cmd/gorelease@latest

.github/workflows/release-go-module.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
- name: Set up Go
7070
uses: actions/setup-go@v5
7171
with:
72-
go-version: '1.23.3'
72+
go-version: 1.23
7373
- name: Install gorelease tool
7474
run: |
7575
go install golang.org/x/exp/cmd/gorelease@latest

.github/workflows/test.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ jobs:
2626
path: ./tools/flakeguard/
2727
- name: workflowresultparser
2828
path: ./tools/workflowresultparser/
29+
- name: parrot
30+
path: ./parrot/
2931
runs-on: ubuntu-latest
3032
name: ${{ matrix.project.name }} unit tests
3133
steps:
@@ -52,7 +54,7 @@ jobs:
5254
make test_unit"
5355
- name: Publish Artifacts
5456
if: failure()
55-
uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
57+
uses: actions/upload-artifact@v4
5658
with:
5759
name: test-logs
5860
path: /tmp/gotest.log

0 commit comments

Comments
 (0)