Skip to content

Commit 2d90e9b

Browse files
authored
ci: separate x86_64 gnu build for dev-linux (#10893)
* fix: separate x86_64 gnu build for dev-linux * ci: remove setup build tool for tests * chore: clean old sqllogic dependencies * chore: use latest sccache * fix: ignore tar.gz for failure * fix: sleep longer for meta cluster
1 parent a4e5187 commit 2d90e9b

File tree

14 files changed

+85
-93
lines changed

14 files changed

+85
-93
lines changed

.github/actions/artifact_failure/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ runs:
1919
--exclude='docker' \
2020
--exclude='bins' \
2121
--exclude='.git' \
22+
--exclude='*.tar.gz' \
2223
--exclude='tests/suites/0_stateless/13_tpch/data' \
2324
-zcf target/failure-${{ inputs.name }}.tar.gz .
2425
- uses: actions/upload-artifact@v3

.github/actions/fuse_compat/action.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ runs:
1919
sha: ${{ github.sha }}
2020
target: ${{ inputs.target }}
2121
path: ./bins/current
22-
- name: Setup Build Tool
23-
uses: ./.github/actions/setup_build_tool
24-
with:
25-
bypass_env_vars: RUSTFLAGS,RUSTDOCFLAGS,RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE
2622
- name: Test compatibility
2723
shell: bash
2824
run: |

.github/actions/test_compat/action.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
@@ -26,7 +23,7 @@ runs:
2623
- name: Test compatibility
2724
shell: bash
2825
run: |
29-
build-tool bash ./tests/compat/test-compat.sh
26+
bash ./tests/compat/test-compat.sh
3027
3128
- name: Upload failure
3229
if: failure() || cancelled()

.github/actions/test_fuzz_standalone_linux/action.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
2118
profile: ${{ inputs.profile }}
2219
sha: ${{ github.sha }}
2320
target: ${{ inputs.target }}
2421

22+
- name: Test setup
23+
shell: bash
24+
run: |
25+
bash ./scripts/setup/dev_setup.sh -yd
26+
2527
- name: Run fuzz Tests with Standalone mode with embedded meta-store
2628
shell: bash
2729
run: |
28-
build-tool bash ./scripts/ci/ci-run-fuzz-tests.sh
30+
bash ./scripts/ci/ci-run-fuzz-tests.sh
2931
3032
- name: Upload failure
3133
if: failure() || cancelled()

.github/actions/test_meta_cluster/action.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
@@ -25,7 +22,7 @@ runs:
2522
- name: Test databend-meta cluster
2623
shell: bash
2724
run: |
28-
build-tool bash ./tests/meta-cluster/test-meta-cluster.sh
25+
bash ./tests/meta-cluster/test-meta-cluster.sh
2926
3027
- name: Upload failure
3128
if: failure() || cancelled()

.github/actions/test_stateless_cluster_linux/action.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
2118
profile: ${{ inputs.profile }}
2219
sha: ${{ github.sha }}
2320
target: ${{ inputs.target }}
2421

22+
- name: Test setup
23+
shell: bash
24+
run: |
25+
bash ./scripts/setup/dev_setup.sh -yd
26+
2527
- name: Run Stateless Tests with Cluster mode
2628
shell: bash
2729
run: |
28-
build-tool bash ./scripts/ci/ci-run-stateless-tests-cluster.sh
30+
bash ./scripts/ci/ci-run-stateless-tests-cluster.sh
2931
3032
- name: Upload failure
3133
if: failure() || cancelled()

.github/actions/test_stateless_standalone_linux/action.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@ inputs:
1212
runs:
1313
using: "composite"
1414
steps:
15-
- name: Setup Build Tool
16-
uses: ./.github/actions/setup_build_tool
17-
1815
- name: Download artifact
1916
uses: ./.github/actions/artifact_download
2017
with:
2118
profile: ${{ inputs.profile }}
2219
sha: ${{ github.sha }}
2320
target: ${{ inputs.target }}
2421

22+
- name: Test setup
23+
shell: bash
24+
run: |
25+
bash ./scripts/setup/dev_setup.sh -yd
26+
2527
- name: Run Stateless Tests with Standalone mode
2628
shell: bash
2729
run: |
28-
build-tool bash ./scripts/ci/ci-run-stateless-tests-standalone.sh
30+
bash ./scripts/ci/ci-run-stateless-tests-standalone.sh
2931
3032
- name: Upload failure
3133
if: failure() || cancelled()

.github/workflows/build-tool.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
arch:
5454
- x86_64
5555
- aarch64
56-
platform:
56+
libc:
5757
- gnu
5858
- musl
5959
steps:
@@ -79,12 +79,12 @@ jobs:
7979
pull: true
8080
push: true
8181
tags: |
82-
${{ steps.login.outputs.dockerhub_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.platform }}
83-
${{ steps.login.outputs.dockerhub_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.platform }}-${{ steps.toolchain.outputs.TOOLCHAIN }}
84-
${{ steps.login.outputs.ecr_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.platform }}
85-
${{ steps.login.outputs.ecr_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.platform }}-${{ steps.toolchain.outputs.TOOLCHAIN }}
86-
context: ./docker/build-tool/${{ matrix.platform }}/
87-
file: ./docker/build-tool/${{ matrix.platform }}/Dockerfile
82+
${{ steps.login.outputs.dockerhub_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.libc }}
83+
${{ steps.login.outputs.dockerhub_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.libc }}-${{ steps.toolchain.outputs.TOOLCHAIN }}
84+
${{ steps.login.outputs.ecr_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.libc }}
85+
${{ steps.login.outputs.ecr_repo }}:${{ matrix.arch }}-unknown-linux-${{ matrix.libc }}-${{ steps.toolchain.outputs.TOOLCHAIN }}
86+
context: ./docker/build-tool/${{ matrix.libc }}/
87+
file: ./docker/build-tool/${{ matrix.libc }}/Dockerfile
8888
build-args: |
8989
ARCH=${{ matrix.arch }}
9090
RUST_TOOLCHAIN=${{ steps.toolchain.outputs.TOOLCHAIN }}

0 commit comments

Comments
 (0)