From c1d98c7dd5ecd13bda6040f0caf0aad0d8c65e4b Mon Sep 17 00:00:00 2001 From: wuhuizuo Date: Fri, 8 Nov 2024 07:25:13 +0000 Subject: [PATCH] chore(tiflash): update the build script path [SKIP-CI] Signed-off-by: wuhuizuo --- dockerfiles/cd/builders/tiflash/Dockerfile | 4 ++-- dockerfiles/cd/builders/tiflash/centos7/Dockerfile | 1 - packages/packages.yaml.tmpl | 8 ++++---- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/dockerfiles/cd/builders/tiflash/Dockerfile b/dockerfiles/cd/builders/tiflash/Dockerfile index ff12ada9..149ac1a1 100644 --- a/dockerfiles/cd/builders/tiflash/Dockerfile +++ b/dockerfiles/cd/builders/tiflash/Dockerfile @@ -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 diff --git a/dockerfiles/cd/builders/tiflash/centos7/Dockerfile b/dockerfiles/cd/builders/tiflash/centos7/Dockerfile index a7e74a3a..666a9121 100644 --- a/dockerfiles/cd/builders/tiflash/centos7/Dockerfile +++ b/dockerfiles/cd/builders/tiflash/centos7/Dockerfile @@ -16,7 +16,6 @@ LABEL org.opencontainers.image.authors "wuhui.zuo@pingcap.com" 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//')"; \ diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index 90eaec66..1f06b286 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -1636,9 +1636,9 @@ components: release: - os: linux script: | - ./release-rocky8-llvm/scripts/build-tiflash-release.sh + ./release-linux-llvm/scripts/build-tiflash-release.sh mkdir outputs - mv release-rocky8-llvm/tiflash outputs/tiflash + mv release-linux-llvm/tiflash outputs/tiflash - os: darwin script: | ./release-darwin/build/build-release.sh @@ -1648,9 +1648,9 @@ components: - script: export TIFLASH_EDITION=Enterprise - os: linux script: | - ./release-rocky8-llvm/scripts/build-tiflash-release.sh + ./release-linux-llvm/scripts/build-tiflash-release.sh mkdir outputs - mv release-rocky8-llvm/tiflash outputs/tiflash + mv release-linux-llvm/tiflash outputs/tiflash - os: darwin script: | ./release-darwin/build/build-release.sh