Skip to content

Commit a914bcb

Browse files
andylokandyandylokandy
committed
Merge branch 'main' of https://github.com/datafuselabs/databend into span
2 parents 7e9d5a7 + 7e6f766 commit a914bcb

File tree

15 files changed

+95
-24
lines changed

15 files changed

+95
-24
lines changed

‎.github/actions/test_stateful_cluster_linux/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ runs:
3939
aws --endpoint-url http://127.0.0.1:9900/ s3 cp tests/data/ontime_200.parquet s3://testbucket/admin/data/ontime_200_v1.parquet
4040
aws --endpoint-url http://127.0.0.1:9900/ s3 cp tests/data/iceberg s3://testbucket/iceberg_data --recursive
4141
42-
- name: Run Stateful Tests with Cluster mode (ubuntu-latest only)
42+
- name: Run Stateful Tests with Cluster mode
4343
shell: bash
4444
run: |
45-
./scripts/ci/ci-run-stateful-tests-cluster-s3.sh
45+
./scripts/ci/ci-run-stateful-tests-cluster-minio.sh
4646
4747
- name: Upload failure
4848
if: failure() || cancelled()

‎.github/actions/test_stateful_large_data/action.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: "Test Stateful Large Data"
2+
description: "Running stateful with large data"
3+
inputs:
4+
profile:
5+
description: "The profile for this test"
6+
required: true
7+
default: "debug"
8+
target:
9+
description: ""
10+
required: true
11+
default: "x86_64-unknown-linux-gnu"
12+
runs:
13+
using: "composite"
14+
steps:
15+
- name: Download artifact
16+
uses: ./.github/actions/artifact_download
17+
with:
18+
profile: ${{ inputs.profile }}
19+
sha: ${{ github.sha }}
20+
target: ${{ inputs.target }}
21+
22+
- name: Run Stateful Tests with Standalone mode
23+
shell: bash
24+
env:
25+
TEST_ID: github-${{ github.run_id }}
26+
run: |
27+
./scripts/ci/ci-run-stateful-tests-large-data-s3.sh
28+
29+
- name: Upload failure
30+
if: failure() || cancelled()
31+
uses: ./.github/actions/artifact_failure
32+
with:
33+
name: test-stateful-large-data

‎.github/actions/test_stateful_standalone_linux/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ runs:
3939
aws --endpoint-url http://127.0.0.1:9900/ s3 cp tests/data/ontime_200.parquet s3://testbucket/admin/data/ontime_200_v1.parquet
4040
aws --endpoint-url http://127.0.0.1:9900/ s3 cp tests/data/iceberg s3://testbucket/iceberg_data --recursive
4141
42-
- name: Run Stateful Tests with Standalone mode (ubuntu-latest only)
42+
- name: Run Stateful Tests with Standalone mode
4343
shell: bash
4444
run: |
45-
./scripts/ci/ci-run-stateful-tests-standalone-s3.sh
45+
./scripts/ci/ci-run-stateful-tests-standalone-minio.sh
4646
4747
- name: Upload failure
4848
if: failure() || cancelled()

‎.github/workflows/backport.yml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ concurrency:
1818
env:
1919
BUILD_PROFILE: release
2020
TARGET: x86_64-unknown-linux-gnu
21-
CARGO_INCREMENTAL: 0
22-
# Remove this env after rust 1.68 has been released.
23-
CARGO_UNSTABLE_SPARSE_REGISTRY: true
2421

2522
jobs:
2623
build:

‎.github/workflows/dev-linux.yml‎

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@ name: Dev Linux
22

33
on:
44
pull_request:
5+
types:
6+
- opened
7+
- synchronize
8+
- reopened
9+
- labeled
510
branches:
611
- main
712
paths-ignore:
@@ -22,9 +27,6 @@ concurrency:
2227
env:
2328
BUILD_PROFILE: debug
2429
RUNNER_PROVIDER: aws
25-
CARGO_INCREMENTAL: 0
26-
# Remove this env after rust 1.68 has been released.
27-
CARGO_UNSTABLE_SPARSE_REGISTRY: true
2830

2931
jobs:
3032
check:
@@ -174,11 +176,10 @@ jobs:
174176
with:
175177
name: test-sqllogic-standalone-${{ matrix.handlers }}-${{ matrix.dirs }}
176178

177-
178179
test_sqllogic_management_mode_linux:
179180
timeout-minutes: 30
180181
name: test_sqllogic_${{ matrix.dirs }}_linux
181-
runs-on: [ self-hosted, X64, Linux, dev ]
182+
runs-on: [self-hosted, X64, Linux, dev]
182183
needs: build_gnu
183184
strategy:
184185
matrix:
@@ -221,7 +222,6 @@ jobs:
221222
with:
222223
name: test-sqllogic-cluster-${{ matrix.handlers }}-${{ matrix.dirs }}
223224

224-
225225
test_stateless_standalone_linux:
226226
timeout-minutes: 20
227227
runs-on: [self-hosted, X64, Linux, dev]
@@ -254,6 +254,15 @@ jobs:
254254
- uses: actions/checkout@v3
255255
- uses: ./.github/actions/test_stateful_cluster_linux
256256

257+
test_stateful_large_data:
258+
timeout-minutes: 60
259+
if: contains(github.event.pull_request.labels.*.name, 'ci-largedata')
260+
runs-on: [self-hosted, X64, Linux, dev]
261+
needs: build_gnu
262+
steps:
263+
- uses: actions/checkout@v3
264+
- uses: ./.github/actions/test_stateful_large_data
265+
257266
test_fuzz_standalone_linux:
258267
timeout-minutes: 10
259268
runs-on: [self-hosted, X64, Linux, dev]

‎.github/workflows/dev-macos.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ concurrency:
1919
env:
2020
BUILD_PROFILE: debug
2121
CARGO_INCREMENTAL: 0
22-
# Remove this env after rust 1.68 has been released.
23-
CARGO_UNSTABLE_SPARSE_REGISTRY: true
2422

2523
jobs:
2624
build_macos:

‎.github/workflows/production.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ concurrency:
1818
env:
1919
BUILD_PROFILE: release
2020
CARGO_INCREMENTAL: 0
21-
# Remove this env after rust 1.68 has been released.
22-
CARGO_UNSTABLE_SPARSE_REGISTRY: true
2321

2422
jobs:
2523
check:

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ jobs:
302302
id: get_version
303303
run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
304304
- name: Set up QEMU
305-
uses: docker/setup-qemu-action@v1
305+
uses: docker/setup-qemu-action@v2
306306
- uses: ./.github/actions/setup_docker
307307
id: login
308308
with:
@@ -366,7 +366,7 @@ jobs:
366366
id: get_version
367367
run: echo "VERSION=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_OUTPUT
368368
- name: Set up QEMU
369-
uses: docker/setup-qemu-action@v1
369+
uses: docker/setup-qemu-action@v2
370370
- uses: ./.github/actions/setup_docker
371371
id: login
372372
with:
@@ -516,7 +516,7 @@ jobs:
516516
asset_content_type: text/plain
517517

518518
run_benchmark:
519-
name: run benchmark
519+
name: benchmark
520520
needs: [create_release, publish_linux]
521521
uses: ./.github/workflows/trusted-benchmark.yml
522522
secrets: inherit

‎.github/workflows/trusted-benchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
echo "head_sha=${{ github.sha }}" >> $GITHUB_OUTPUT
5454
echo "run_id=${{ github.run_id }}" >> $GITHUB_OUTPUT
5555
echo "source=release" >> $GITHUB_OUTPUT
56-
echo "source_id=${{ github.event.inputs.tag }}" >> $GITHUB_OUTPUT
56+
echo "source_id=${{ inputs.tag }}" >> $GITHUB_OUTPUT
5757
;;
5858
esac
5959
- uses: ./.github/actions/create_check_status

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ CLUSTER_ID ?= "test"
99

1010
CARGO_TARGET_DIR ?= $(CURDIR)/target
1111

12-
# Remove this env after rust 1.68 has been released.
13-
export CARGO_UNSTABLE_SPARSE_REGISTRY = true
14-
1512
# Setup dev toolchain
1613
setup:
1714
bash ./scripts/setup/dev_setup.sh

0 commit comments

Comments
 (0)