Skip to content

Commit 51efbb3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into feature_cluster
2 parents b2c689e + d6eca28 commit 51efbb3

File tree

84 files changed

+1353
-1161
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+1353
-1161
lines changed

.github/actions/publish_binary/action.yml

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,39 @@ inputs:
1313
repo_role_arn:
1414
description: "Repo Role Arn"
1515
required: true
16+
mode:
17+
description: "Release Normal / Hive"
18+
required: false
19+
default: normal
1620

1721
runs:
1822
using: "composite"
1923
steps:
20-
- name: Update release to github
24+
- name: Update normal release to github
2125
shell: bash
2226
# Reference: https://cli.github.com/manual/gh_release_upload
27+
if: inputs.mode == 'normal'
2328
run: gh release upload ${{ inputs.version }} databend-${{ inputs.version }}-${{ inputs.target }}.* --clobber
2429
env:
2530
GH_TOKEN: ${{ inputs.github_token }}
2631

32+
- name: Update hive release to github
33+
shell: bash
34+
if: inputs.mode == 'hive'
35+
run: gh release upload ${{ inputs.version }} databend-hive-${{ inputs.version }}-${{ inputs.target }}.* --clobber
36+
env:
37+
GH_TOKEN: ${{ inputs.github_token }}
38+
2739
- name: Configure AWS credentials
2840
uses: aws-actions/configure-aws-credentials@v1
2941
with:
3042
role-duration-seconds: 900
3143
role-to-assume: ${{ inputs.repo_role_arn }}
3244
aws-region: us-east-2
3345

34-
- name: Sync release to S3
46+
- name: Sync normal release to S3
3547
shell: bash
48+
if: inputs.mode == 'normal'
3649
run: |
3750
aws s3 cp databend-${{ inputs.version }}-${{ inputs.target }}.tar.gz s3://repo.databend.rs/databend/${{ inputs.version }}/databend-${{ inputs.version }}-${{ inputs.target }}.tar.gz
3851
curl --retry 3 -fsSLo tags.json \
@@ -47,3 +60,21 @@ runs:
4760
https://api.github.com/repos/datafuselabs/databend/releases
4861
cat releases.json
4962
aws s3 cp ./releases.json s3://repo.databend.rs/databend/releases.json
63+
64+
- name: Sync hive release to S3
65+
shell: bash
66+
if: inputs.mode == 'hive'
67+
run: |
68+
aws s3 cp databend-hive-${{ inputs.version }}-${{ inputs.target }}.tar.gz s3://repo.databend.rs/databend/${{ inputs.version }}/databend-hive-${{ inputs.version }}-${{ inputs.target }}.tar.gz
69+
curl --retry 3 -fsSLo tags.json \
70+
--header 'content-type: application/json' \
71+
--header 'authorization: Bearer ${{ inputs.github_token }}' \
72+
https://api.github.com/repos/datafuselabs/databend/tags
73+
cat tags.json
74+
aws s3 cp ./tags.json s3://repo.databend.rs/databend/tags.json
75+
curl --retry 3 -fsSLo releases.json \
76+
--header 'content-type: application/json' \
77+
--header 'authorization: Bearer ${{ inputs.github_token }}' \
78+
https://api.github.com/repos/datafuselabs/databend/releases
79+
cat releases.json
80+
aws s3 cp ./releases.json s3://repo.databend.rs/databend/releases.json

.github/actions/test_unit/action.yml

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,11 @@ runs:
1414
bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
1515

1616
- shell: bash
17-
run: cargo -Z sparse-registry test --no-fail-fast
17+
run: cargo -Z sparse-registry test
1818
env:
1919
RUST_TEST_THREADS: "2"
20-
RUST_LOG: ERROR
20+
RUST_LOG: DEBUG
2121
RUST_BACKTRACE: full
22-
# RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests --cfg tokio_unstable'
23-
# RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Zpanic_abort_tests'
24-
25-
# Temporarily disable test coverage checks to save CI resources.
26-
# The main purpose is to avoid OOM due to build for specific target.
27-
#
28-
# Instructions
29-
# - `uncomment/enable`: If we self-host the CI or split the repo (especially, common-functions) to a finer granularity.
30-
# - `remove`: If we lack the need for test coverage, or adopt a new solution.
31-
32-
# - name: Install grcov
33-
# uses: actions-rs/cargo@v1
34-
# with:
35-
# command: install
36-
# args: grcov
37-
38-
# - name: Run code coverage
39-
# uses: actions-rs/grcov@v0.1.5
40-
# id: coverage
41-
42-
# - name: Upload to codecov.io
43-
# uses: codecov/codecov-action@v1
44-
# with:
45-
# token: ${{ inputs.codecov_token }}
46-
# file: ${{ steps.coverage.outputs.report }}
4722

4823
- name: Upload failure
4924
if: failure()

.github/workflows/databend-release.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -278,9 +278,10 @@ jobs:
278278
uses: ./.github/actions/publish_binary
279279
with:
280280
github_token: ${{ secrets.GITHUB_TOKEN }}
281-
version: hive-${{ needs.create_release.outputs.version }}
281+
version: ${{ needs.create_release.outputs.version }}
282282
target: ${{ steps.target.outputs.target }}
283283
repo_role_arn: ${{ secrets.REPO_ROLE_ARN }}
284+
mode: hive
284285

285286
publish_sqllogic_testsuites:
286287
name: sqllogic testsuites

0 commit comments

Comments
 (0)