Skip to content

Commit

Permalink
chore(tiflash): update build steps for tiflash starts v8.5.0 (#488)
Browse files Browse the repository at this point in the history
Ref pingcap/tiflash#9587, it changes the build
script paths.

Signed-off-by: wuhuizuo <[email protected]>

---------

Signed-off-by: wuhuizuo <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
wuhuizuo and pre-commit-ci[bot] authored Nov 8, 2024
1 parent e807718 commit ae9dd7b
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 5 deletions.
4 changes: 2 additions & 2 deletions dockerfiles/cd/builders/tiflash/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ ENV PATH /root/.cargo/bin/:$PATH
FROM builder as building

ADD . /ws
RUN CARGO_NET_GIT_FETCH_WITH_CLI=true /ws/release-centos7-llvm/scripts/build-release.sh
RUN mkdir output && mv /ws/release-centos7-llvm/tiflash output/tiflash
RUN CARGO_NET_GIT_FETCH_WITH_CLI=true /ws/release-linux-llvm/scripts/build-release.sh
RUN mkdir output && mv /ws/release-linux-llvm/tiflash output/tiflash
RUN output/tiflash/tiflash version

########### stage: Final image
Expand Down
1 change: 0 additions & 1 deletion dockerfiles/cd/builders/tiflash/centos7/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ LABEL org.opencontainers.image.authors "[email protected]"
LABEL org.opencontainers.image.description "binary builder for tiflash"
LABEL org.opencontainers.image.source = "https://github.com/PingCAP-QE/artifacts"

# renovate: datasource=github-tags depName=pingcap/tiflash
ARG TIFLASH_VER=v8.3.0
RUN FILE=$([ "$(arch)" = "aarch64" ] && echo "bake_llvm_base_aarch64.sh" || echo "bake_llvm_base_amd64.sh"); \
TAR_DIR="tiflash-$(echo $TIFLASH_VER | sed 's/v//')"; \
Expand Down
51 changes: 49 additions & 2 deletions packages/packages.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -1627,8 +1627,55 @@ components:
- if: {{ semver.CheckConstraint ">= 6.1.0-0, < 8.2.0-0" .Release.version }}
image: hub.pingcap.net/ee/ci/release-build-base-tiflash:v20231106
routers:
- description: For range [v8.4.0, )
if: {{ semver.CheckConstraint ">= 8.4.0-0" .Release.version }}
- description: For range [v8.5.0, ) it changed the build script path.
if: {{ semver.CheckConstraint ">= 8.5.0-0" .Release.version }}
os: [linux, darwin]
arch: [amd64, arm64]
profile: [release, enterprise]
steps:
release:
- os: linux
script: |
./release-linux-llvm/scripts/build-tiflash-release.sh
mkdir outputs
mv release-linux-llvm/tiflash outputs/tiflash
- os: darwin
script: |
./release-darwin/build/build-release.sh
mkdir outputs
mv release-darwin/tiflash outputs/tiflash
enterprise:
- script: export TIFLASH_EDITION=Enterprise
- os: linux
script: |
./release-linux-llvm/scripts/build-tiflash-release.sh
mkdir outputs
mv release-linux-llvm/tiflash outputs/tiflash
- os: darwin
script: |
./release-darwin/build/build-release.sh
mkdir outputs
mv release-darwin/tiflash outputs/tiflash
artifacts:
- name: "tiflash-{{ .Release.version }}-{{ .Release.os }}-{{ .Release.arch }}.tar.gz"
files: # output files.
- name: tiflash/
src:
path: outputs/tiflash/
tiup:
description: The TiFlash Columnar Storage Engine
entrypoint: tiflash/tiflash
- name: container image
type: image
artifactory:
repo: "{{ .Release.registry }}/pingcap/tiflash/image"
dockerfile: https://github.com/PingCAP-QE/artifacts/raw/main/dockerfiles/products/tiflash/Dockerfile
files:
- name: tiflash/
src:
path: outputs/tiflash/
- description: For v8.4.x
if: {{ semver.CheckConstraint "~8.4.0-0" .Release.version }}
os: [linux, darwin]
arch: [amd64, arm64]
profile: [release, enterprise]
Expand Down

0 comments on commit ae9dd7b

Please sign in to comment.