Skip to content

Commit c407340

Browse files
authored
ci: fix benchmark check run_id on pr & cleanup (#10771)
1 parent 7a9c87b commit c407340

File tree

5 files changed

+63
-96
lines changed

5 files changed

+63
-96
lines changed

.github/actions/test_unit/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
name: "Test Unite"
22
description: "Running unit tests"
3-
inputs:
4-
codecov_token:
5-
description: "CodeCov Token"
6-
required: true
73

84
runs:
95
using: "composite"

.github/workflows/dev-linux.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ jobs:
9797
fetch-depth: 0
9898
- uses: ./.github/actions/test_unit
9999
timeout-minutes: 30
100-
with:
101-
codecov_token: ${{ secrets.CODECOV_TOKEN }}
102100

103101
test_metactl:
104102
runs-on: [self-hosted, X64, Linux, dev]

.github/workflows/production.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,6 @@ jobs:
8585
# fetch all tags, metasrv and metaclient need tag as its version.
8686
fetch-depth: 0
8787
- uses: ./.github/actions/test_unit
88-
with:
89-
codecov_token: ${{ secrets.CODECOV_TOKEN }}
9088

9189
test_stateless_standalone_linux:
9290
runs-on: ubuntu-latest

.github/workflows/release.yml

Lines changed: 32 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ jobs:
7979
env:
8080
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8181

82-
publish_macos:
83-
name: macos assets
82+
macos:
8483
runs-on: macos-11
8584
needs: [create_release]
8685
strategy:
@@ -142,8 +141,7 @@ jobs:
142141
target: ${{ steps.target.outputs.target }}
143142
repo_role_arn: ${{ secrets.REPO_ROLE_ARN }}
144143

145-
publish_linux:
146-
name: linux assets
144+
linux:
147145
runs-on: [self-hosted, X64, Linux, perf]
148146
needs: [create_release]
149147
env:
@@ -206,8 +204,7 @@ jobs:
206204
target: ${{ steps.target.outputs.target }}
207205
repo_role_arn: ${{ secrets.REPO_ROLE_ARN }}
208206

209-
publish_hive:
210-
name: hive assets
207+
hive:
211208
runs-on: [self-hosted, X64, Linux, dev]
212209
needs: [create_release]
213210
env:
@@ -277,8 +274,7 @@ jobs:
277274
repo_role_arn: ${{ secrets.REPO_ROLE_ARN }}
278275
mode: hive
279276

280-
publish_sqllogic_testsuites:
281-
name: sqllogic testsuites
277+
testsuites:
282278
runs-on: ubuntu-latest
283279
needs: [create_release]
284280
steps:
@@ -295,10 +291,10 @@ jobs:
295291
tar -C ./tests/sqllogictests -czvf testsuites-${version}.tar.gz suites
296292
gh release upload ${version} testsuites-${version}.tar.gz --clobber
297293
298-
release_docker_combined:
299-
name: docker image combined
294+
docker_combined:
295+
name: docker combined
300296
runs-on: [self-hosted, X64, Linux, dev]
301-
needs: [create_release, publish_linux]
297+
needs: [create_release, linux]
302298
steps:
303299
- name: Checkout
304300
uses: actions/checkout@v3
@@ -350,10 +346,10 @@ jobs:
350346
short-description: ${{ github.event.repository.description }}
351347
readme-filepath: ./docker/README.md
352348

353-
release_docker_separate:
354-
name: docker image seperated
349+
docker_separate:
350+
name: docker separate
355351
runs-on: [self-hosted, X64, Linux, dev]
356-
needs: [create_release, publish_linux]
352+
needs: [create_release, linux]
357353
strategy:
358354
fail-fast: false
359355
matrix:
@@ -414,10 +410,9 @@ jobs:
414410
context: .
415411
file: ./docker/${{ matrix.distro }}/${{ matrix.service }}.Dockerfile
416412

417-
release_packages:
418-
name: release packages
413+
distribution:
419414
runs-on: [self-hosted, X64, Linux, dev]
420-
needs: [create_release, publish_linux]
415+
needs: [create_release, linux]
421416
strategy:
422417
matrix:
423418
arch:
@@ -472,10 +467,9 @@ jobs:
472467
env:
473468
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
474469

475-
publish_deb:
476-
name: publish deb
470+
deb:
477471
runs-on: ubuntu-latest
478-
needs: [create_release, release_packages]
472+
needs: [create_release, distribution]
479473
steps:
480474
- uses: actions/checkout@v3
481475
- uses: ./.github/actions/publish_deb
@@ -484,21 +478,12 @@ jobs:
484478
repo_role_arn: ${{ secrets.REPO_ROLE_ARN }}
485479
gpg_signing_key: ${{ secrets.GPG_KEY_DEB }}
486480

487-
upload-sha256sums-plugin:
488-
needs: [create_release, publish_linux, publish_macos, release_packages]
481+
sha256sums:
482+
needs: [create_release, linux, macos, distribution]
489483
runs-on: ubuntu-latest
490-
name: upload-sha256sums
491484
steps:
492485
- name: checkout
493486
uses: actions/checkout@v3
494-
- name: Get Pre-release
495-
uses: cardinalby/git-get-release-action@v1
496-
id: latest_pre_release
497-
env:
498-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
499-
with:
500-
prerelease: true
501-
latest: true
502487
- name: download sha256sums
503488
uses: actions/download-artifact@v3
504489
with:
@@ -509,36 +494,32 @@ jobs:
509494
do
510495
cat ${file} >> sha256sums.txt
511496
done
512-
- name: upload checksums
513-
uses: actions/[email protected]
497+
- name: Upload checksums
498+
shell: bash'
514499
env:
515-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
516-
with:
517-
upload_url: ${{ steps.latest_pre_release.outputs.upload_url }}
518-
asset_path: sha256sums.txt
519-
asset_name: sha256sums.txt
520-
asset_content_type: text/plain
500+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
501+
run: |
502+
version="${{ needs.create_release.outputs.version }}"
503+
gh release upload ${version} sha256sums.txt --clobber
521504
522-
run_benchmark:
523-
name: benchmark
524-
needs: [create_release, publish_linux]
505+
benchmark:
506+
needs: [create_release, linux]
525507
uses: ./.github/workflows/trusted-benchmark.yml
526508
secrets: inherit
527509
with:
528510
tag: ${{ needs.create_release.outputs.version }}
529511

530-
notify_build_result:
531-
name: notify build result
512+
notify:
532513
runs-on: ubuntu-latest
533514
if: always()
534515
needs:
535516
- create_release
536-
- publish_linux
537-
- publish_macos
538-
- release_docker_combined
539-
- release_docker_separate
540-
- release_packages
541-
- publish_deb
517+
- linux
518+
- docker_combined
519+
- docker_separate
520+
- distribution
521+
- deb
522+
- sha256sums
542523
steps:
543524
- uses: actions/checkout@v3
544525
- run: |
@@ -548,7 +529,7 @@ jobs:
548529
--arg content "Build result: ${status}" \
549530
--arg link "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}" \
550531
> /tmp/release-report.json
551-
curl -X POST ${{ secrets.RELEASE_REPORT_WEBHOOK }} \
532+
curl -X POST "${{ secrets.RELEASE_REPORT_WEBHOOK }}" \
552533
-H 'Content-Type: application/json' \
553534
-H 'cache-control: no-cache' \
554535
-d @/tmp/release-report.json

0 commit comments

Comments
 (0)