Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
b41sh committed Apr 6, 2022
2 parents a1e44af + 4ef6f03 commit fb539b1
Show file tree
Hide file tree
Showing 329 changed files with 731 additions and 356 deletions.
2 changes: 1 addition & 1 deletion .github/actions/build_debug/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
if: "contains(inputs.target, 'linux')"
uses: ./.github/actions/setup_build_tool
with:
image: datafuselabs/build-tool:multiarch
image: multiarch

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/build_release/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ runs:
if: "contains(inputs.target, 'linux')"
uses: ./.github/actions/setup_build_tool
with:
image: datafuselabs/build-tool:multiarch
image: multiarch

# If you need to reset the cache version, increment the number after `v`
- uses: Swatinem/rust-cache@v1
Expand Down
4 changes: 2 additions & 2 deletions .github/actions/setup_build_tool/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ inputs:
image:
description: "Build Tool Docker Image to use"
required: true
default: datafuselabs/build-tool:dev-debian-amd64
default: dev-debian-amd64
bypass_env_vars:
description: "Environment variables bypass to docker container"
required: false
Expand All @@ -28,7 +28,7 @@ runs:
cat <<EOF >$BIN_LOCAL/build-tool
#!/bin/bash
script_name=\$(basename "\$0")
export IMAGE=${{ inputs.image }}
export IMAGE=datafuselabs/build-tool:${{ inputs.image }}
export BYPASS_ENV_VARS=${{ inputs.bypass_env_vars }}
if [[ \${script_name} == "build-tool" ]]; then
scripts/setup/run_build_tool.sh \$@
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/test_unit/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ runs:
- name: Setup Build Tool
uses: ./.github/actions/setup_build_tool
with:
image: datafuselabs/build-tool:dev-debian-amd64
image: dev-debian-amd64
bypass_env_vars: RUST_TEST_THREADS,RUST_LOG,RUST_BACKTRACE

# If you need to reset the cache version, increment the number after `v`
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/databend-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ jobs:
- name: Setup Build Tool
uses: ./.github/actions/setup_build_tool
with:
image: datafuselabs/build-tool:multiarch
image: multiarch
- name: get objcopy path
id: get_objcopy
shell: bash
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ on:
branches:
- main
paths:
- "rust-toolchain.toml"
- "scripts/setup/**"

jobs:
Expand Down Expand Up @@ -33,7 +32,7 @@ jobs:
- name: Get rust toolchain version
id: toolchain_version
run: |
version=$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' rust-toolchain.toml)
version=$(awk -F'[ ="]+' '$1 == "channel" { print $2 }' scripts/setup/rust-toolchain.toml)
echo "::set-output name=RUST_TOOLCHAIN::${version}"
- name: Build and publish databend build base image
Expand Down
Loading

0 comments on commit fb539b1

Please sign in to comment.