Skip to content

Commit

Permalink
Merge branch 'main' into sample
Browse files Browse the repository at this point in the history
  • Loading branch information
xudong963 authored Aug 12, 2024
2 parents 9a60ee4 + da0dfaa commit 726d33b
Show file tree
Hide file tree
Showing 172 changed files with 4,638 additions and 4,333 deletions.
36 changes: 0 additions & 36 deletions .github/workflows/build_tool.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,42 +41,6 @@ jobs:
file: ./docker/build-tool/debian/Dockerfile
platforms: linux/amd64,linux/arm64

musl:
needs: debian
runs-on: ubuntu-latest
strategy:
matrix:
arch:
- aarch64
- x86_64
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup_docker
id: login
with:
repo: build-tool
ecr_role_arn: ${{ secrets.ECR_ROLE_ARN }}
dockerhub_user: ${{ secrets.DOCKERHUB_USERNAME }}
dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Get rust toolchain version
id: toolchain
run: |
version=$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' scripts/setup/rust-toolchain.toml)
echo "TOOLCHAIN=${version}" >> $GITHUB_OUTPUT
- name: Build and publish databend build image
uses: docker/build-push-action@v5
with:
pull: true
push: true
tags: |
${{ steps.login.outputs.dockerhub_repo }}:${{ matrix.arch }}-unknown-linux-musl
${{ steps.login.outputs.dockerhub_repo }}:${{ matrix.arch }}-unknown-linux-musl-${{ steps.toolchain.outputs.TOOLCHAIN }}
context: ./docker/build-tool/musl
file: ./docker/build-tool/musl/Dockerfile
build-args: |
ARCH=${{ matrix.arch }}
RUST_TOOLCHAIN=${{ steps.toolchain.outputs.TOOLCHAIN }}
dev:
runs-on: ubuntu-latest
needs: debian
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ jobs:
include:
- { target: x86_64-unknown-linux-gnu, runner: X64 }
- { target: aarch64-unknown-linux-gnu, runner: ARM64 }
- { target: x86_64-unknown-linux-musl, runner: X64 }
- { target: aarch64-unknown-linux-musl, runner: X64 }
steps:
- name: Checkout
uses: actions/checkout@v4
Expand All @@ -124,7 +122,6 @@ jobs:
target: ${{ matrix.target }}
artifacts: sqllogictests,sqlsmith,query,meta,metactl,metaverifier
- name: Basic Sqllogic Test
if: matrix.target != 'aarch64-unknown-linux-musl'
shell: bash
env:
TEST_HANDLERS: http
Expand Down Expand Up @@ -198,12 +195,6 @@ jobs:
- category: default
target: aarch64-unknown-linux-gnu
runner: ARM64
- category: default
target: x86_64-unknown-linux-musl
runner: X64
- category: default
target: aarch64-unknown-linux-musl
runner: X64
- category: hdfs
target: x86_64-unknown-linux-gnu
runner: X64
Expand Down
24 changes: 2 additions & 22 deletions .github/workflows/reuse.linux.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,26 +105,6 @@ jobs:
# target: ${{ matrix.arch }}-unknown-linux-gnu
# artifacts: query

build_musl:
runs-on: [self-hosted, X64, Linux, 16c32g, "${{ inputs.runner_provider }}"]
strategy:
fail-fast: false
matrix:
arch:
- x86_64
- aarch64
steps:
- uses: actions/checkout@v4
with:
# fetch all tags, metasrv and metaclient need tag as its version.
fetch-depth: 0
- uses: ./.github/actions/build_linux
timeout-minutes: 60
with:
sha: ${{ github.sha }}
target: ${{ matrix.arch }}-unknown-linux-musl
artifacts: query

test_unit:
runs-on: [self-hosted, X64, Linux, 16c32g, "${{ inputs.runner_provider }}"]
steps:
Expand Down Expand Up @@ -296,8 +276,8 @@ jobs:
name: test-stateful-standalone-linux

test_ee_standalone_fake_time:
needs: [ build, check ]
runs-on: [ self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}" ]
needs: [build, check]
runs-on: [self-hosted, X64, Linux, 4c8g, "${{ inputs.runner_provider }}"]
steps:
- uses: actions/checkout@v4
- uses: ./.github/actions/setup_license
Expand Down
Loading

0 comments on commit 726d33b

Please sign in to comment.