Skip to content

Commit f7fcd3e

Browse files
authored
Merge pull request #10545 from everpcpc/chore-ci
chore(ci): upgrade aws-actions/configure-aws-credentials to v2
2 parents 83215be + 40edd6a commit f7fcd3e

File tree

8 files changed

+21
-25
lines changed

8 files changed

+21
-25
lines changed

.github/actions/benchmark_cloud/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ runs:
9494
jq ".machine = \"${{ inputs.size }}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
9595
jq ".tags = [\"${BENCHMARK_TYPE}\", \"serverless\"]" <result.json >result.json.tmp && mv result.json.tmp result.json
9696
jq ".comment = \"commit:${{ inputs.sha }}\"" <result.json >result.json.tmp && mv result.json.tmp result.json
97-
mv result.json result-${{ inputs.dataset }}-cloud.json
97+
mv result.json result-${{ inputs.dataset }}-cloud-${{ inputs.size }}.json
9898
9999
- name: Upload artifact
100100
uses: actions/upload-artifact@v3

.github/actions/publish_binary/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ runs:
3737
GH_TOKEN: ${{ inputs.github_token }}
3838

3939
- name: Configure AWS credentials
40-
uses: aws-actions/configure-aws-credentials@v1
40+
uses: aws-actions/configure-aws-credentials@v2
4141
with:
4242
role-duration-seconds: 900
4343
role-to-assume: ${{ inputs.repo_role_arn }}

.github/actions/publish_deb/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ runs:
4141
reprepro includedeb stable databend_${deb_version}_arm64.deb
4242
4343
- name: Configure AWS credentials
44-
uses: aws-actions/configure-aws-credentials@v1
44+
uses: aws-actions/configure-aws-credentials@v2
4545
with:
4646
role-duration-seconds: 900
4747
role-to-assume: ${{ inputs.repo_role_arn }}

.github/actions/setup_docker/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ runs:
2929

3030
- name: Configure AWS Credentials
3131
if: inputs.ecr_role_arn
32-
uses: aws-actions/configure-aws-credentials@v1
32+
uses: aws-actions/configure-aws-credentials@v2
3333
with:
3434
role-to-assume: ${{ inputs.ecr_role_arn }}
3535
role-duration-seconds: 900

.github/workflows/dev-macos.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ jobs:
6565
# runs-on: macos-11
6666
# needs: build_macos
6767
# steps:
68-
# - uses: actions/checkout@v2
68+
# - uses: actions/checkout@v3
6969
# - uses: ./.github/actions/test_sqllogic_standalone_macos

.github/workflows/production.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
- "base"
154154
- "ydb"
155155
steps:
156-
- uses: actions/checkout@v2
156+
- uses: actions/checkout@v3
157157
- uses: ./.github/actions/test_sqllogic_standalone_macos
158158
with:
159159
profile: release
@@ -177,7 +177,7 @@ jobs:
177177
- "http"
178178
- "clickhouse"
179179
steps:
180-
- uses: actions/checkout@v2
180+
- uses: actions/checkout@v3
181181
- uses: ./.github/actions/test_sqllogic_standalone_linux
182182
with:
183183
profile: release

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ jobs:
485485
name: upload-sha256sums
486486
steps:
487487
- name: checkout
488-
uses: actions/checkout@v2
488+
uses: actions/checkout@v3
489489
- name: Get Pre-release
490490
uses: cardinalby/git-get-release-action@v1
491491
id: latest_pre_release

.github/workflows/trusted-benchmark.yml

Lines changed: 13 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -159,30 +159,26 @@ jobs:
159159
needs: [metadata, docker]
160160
timeout-minutes: 60
161161
runs-on: [self-hosted, X64, Linux, dev]
162+
strategy:
163+
matrix:
164+
dataset:
165+
- hits
166+
- tpch
167+
size:
168+
- Medium
169+
fail-fast: true
170+
max-parallel: 1
162171
steps:
163172
- uses: actions/checkout@v3
164173
- uses: ./.github/actions/setup_bendsql
165174
- uses: ./.github/actions/benchmark_cloud
166175
with:
167176
sha: ${{ needs.metadata.outputs.sha }}
168177
run_id: ${{ needs.metadata.outputs.run_id }}
169-
dataset: hits
170-
source: ${{ needs.metadata.outputs.source }}
171-
source_id: ${{ needs.metadata.outputs.source_id }}
172-
size: Medium
173-
image_tag: ${{ needs.docker.outputs.tag }}
174-
cloud_email: ${{ secrets.BENCHMARK_CLOUD_EMAIL }}
175-
cloud_password: ${{ secrets.BENCHMARK_CLOUD_PASSWORD }}
176-
cloud_org: ${{ secrets.BENCHMARK_CLOUD_ORG }}
177-
cloud_endpoint: ${{ secrets.BENCHMARK_CLOUD_ENDPOINT }}
178-
- uses: ./.github/actions/benchmark_cloud
179-
with:
180-
sha: ${{ needs.metadata.outputs.sha }}
181-
run_id: ${{ needs.metadata.outputs.run_id }}
182-
dataset: tpch
178+
dataset: ${{ matrix.dataset }}
183179
source: ${{ needs.metadata.outputs.source }}
184180
source_id: ${{ needs.metadata.outputs.source_id }}
185-
size: Medium
181+
size: ${{ matrix.size }}
186182
image_tag: ${{ needs.docker.outputs.tag }}
187183
cloud_email: ${{ secrets.BENCHMARK_CLOUD_EMAIL }}
188184
cloud_password: ${{ secrets.BENCHMARK_CLOUD_PASSWORD }}
@@ -196,7 +192,7 @@ jobs:
196192
steps:
197193
- uses: actions/checkout@v3
198194
- name: Configure AWS Credentials
199-
uses: aws-actions/configure-aws-credentials@v1
195+
uses: aws-actions/configure-aws-credentials@v2
200196
with:
201197
role-to-assume: ${{ secrets.REPO_ROLE_ARN }}
202198
role-duration-seconds: 900
@@ -267,7 +263,7 @@ jobs:
267263
steps:
268264
- uses: actions/checkout@v3
269265
- name: Configure AWS Credentials
270-
uses: aws-actions/configure-aws-credentials@v1
266+
uses: aws-actions/configure-aws-credentials@v2
271267
with:
272268
role-to-assume: ${{ secrets.REPO_ROLE_ARN }}
273269
role-duration-seconds: 900

0 commit comments

Comments
 (0)