diff --git a/dockerfiles/cd/builders/ng-monitoring/Dockerfile b/dockerfiles/cd/builders/ng-monitoring/Dockerfile index 15f1630f..c254461c 100644 --- a/dockerfiles/cd/builders/ng-monitoring/Dockerfile +++ b/dockerfiles/cd/builders/ng-monitoring/Dockerfile @@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \ # install golang toolchain # renovate: datasource=docker depName=golang -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin/:$PATH diff --git a/dockerfiles/cd/builders/skaffold-centos7.yaml b/dockerfiles/cd/builders/skaffold-centos7.yaml index 234a4da5..ffd95ca1 100644 --- a/dockerfiles/cd/builders/skaffold-centos7.yaml +++ b/dockerfiles/cd/builders/skaffold-centos7.yaml @@ -52,7 +52,7 @@ profiles: path: /build/artifacts/0/docker/buildArgs value: &value-go1-23 # renovate: datasource=docker depName=golang - GOLANG_VERSION: 1.23.2 + GOLANG_VERSION: 1.23.3 - op: add path: /build/artifacts/1/docker/buildArgs value: *value-go1-23 diff --git a/dockerfiles/cd/builders/skaffold.yaml b/dockerfiles/cd/builders/skaffold.yaml index 2049a9a4..c9a498fb 100644 --- a/dockerfiles/cd/builders/skaffold.yaml +++ b/dockerfiles/cd/builders/skaffold.yaml @@ -58,7 +58,7 @@ profiles: path: /build/artifacts/0/docker/buildArgs value: &value-go1-23 # renovate: datasource=docker depName=golang - GOLANG_VERSION: 1.23.2 + GOLANG_VERSION: 1.23.3 - op: add path: /build/artifacts/1/docker/buildArgs value: *value-go1-23 diff --git a/dockerfiles/cd/builders/tidb-dashboard/Dockerfile b/dockerfiles/cd/builders/tidb-dashboard/Dockerfile index d6629296..ed7061d8 100644 --- a/dockerfiles/cd/builders/tidb-dashboard/Dockerfile +++ b/dockerfiles/cd/builders/tidb-dashboard/Dockerfile @@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \ # install golang toolchain # renovate: datasource=docker depName=golang -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin/:$PATH diff --git a/dockerfiles/cd/builders/tidb-operator/Dockerfile b/dockerfiles/cd/builders/tidb-operator/Dockerfile index 3ddd3863..ecf1a918 100644 --- a/dockerfiles/cd/builders/tidb-operator/Dockerfile +++ b/dockerfiles/cd/builders/tidb-operator/Dockerfile @@ -7,7 +7,7 @@ # - docker build -t tidb-operator -f Dockerfile ./tidb-operator ########### stage: builder -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 FROM golang:${GOLANG_VERSION} as builder LABEL org.opencontainers.image.authors "wuhui.zuo@pingcap.com" LABEL org.opencontainers.image.description "binary builder for TiDB Operator" diff --git a/dockerfiles/cd/builders/tidb/Dockerfile b/dockerfiles/cd/builders/tidb/Dockerfile index df726b07..8a9e67f2 100644 --- a/dockerfiles/cd/builders/tidb/Dockerfile +++ b/dockerfiles/cd/builders/tidb/Dockerfile @@ -19,7 +19,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \ # install golang toolchain # renovate: datasource=docker depName=golang -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin/:$PATH diff --git a/dockerfiles/cd/builders/tiflash/Dockerfile b/dockerfiles/cd/builders/tiflash/Dockerfile index e58d4b15..dd2643fb 100644 --- a/dockerfiles/cd/builders/tiflash/Dockerfile +++ b/dockerfiles/cd/builders/tiflash/Dockerfile @@ -42,10 +42,11 @@ ENV PATH="/opt/cmake/bin:/usr/local/bin/:${PATH}:/usr/local/go/bin:/root/.cargo/ FROM builder as building ADD . /ws -RUN CARGO_NET_GIT_FETCH_WITH_CLI=true /ws/release-centos7-llvm/scripts/build-release.sh -RUN mkdir /ws/output && mv /ws/release-centos7-llvm/tiflash /ws/output/tiflash +RUN CARGO_NET_GIT_FETCH_WITH_CLI=true /ws/release-linux-llvm/scripts/build-release.sh +RUN mkdir /ws/output && mv /ws/release-linux-llvm/tiflash /ws/output/tiflash RUN /ws/output/tiflash/tiflash version + ########### stage: Final image FROM ghcr.io/pingcap-qe/bases/tiflash-base:v1.9.2 diff --git a/dockerfiles/cd/builders/tiflash/centos7/Dockerfile b/dockerfiles/cd/builders/tiflash/centos7/Dockerfile index b31a45ca..45c52d0f 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/dockerfiles/cd/builders/tiflow/Dockerfile b/dockerfiles/cd/builders/tiflow/Dockerfile index 89c3f1a8..cbc88b36 100644 --- a/dockerfiles/cd/builders/tiflow/Dockerfile +++ b/dockerfiles/cd/builders/tiflow/Dockerfile @@ -15,7 +15,7 @@ RUN --mount=type=cache,target=/var/cache/dnf \ # install golang toolchain # renovate: datasource=docker depName=golang -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin/:$PATH diff --git a/dockerfiles/cd/utils/release/Dockerfile b/dockerfiles/cd/utils/release/Dockerfile index 4fb8a056..bb703b94 100644 --- a/dockerfiles/cd/utils/release/Dockerfile +++ b/dockerfiles/cd/utils/release/Dockerfile @@ -9,7 +9,7 @@ LABEL org.opencontainers.image.source "https://github.com/PingCAP-QE/artifacts" RUN apk add --no-cache bash git jq yq uuidgen # install tools: gomplate -COPY --from=hairyhenderson/gomplate:v4.1.0-alpine /bin/gomplate /usr/local/bin/gomplate +COPY --from=hairyhenderson/gomplate:v4.2.0-alpine /bin/gomplate /usr/local/bin/gomplate # install tools: oras COPY --from=ghcr.io/oras-project/oras:v1.2.0 --chown=0:0 /bin/oras /usr/local/bin/oras diff --git a/dockerfiles/ci/base/Dockerfile b/dockerfiles/ci/base/Dockerfile index 85d333ab..663a1193 100644 --- a/dockerfiles/ci/base/Dockerfile +++ b/dockerfiles/ci/base/Dockerfile @@ -32,7 +32,7 @@ RUN if [ "$(arch)" = "x86_64" ]; then \ # install golang toolchain # renovate: datasource=docker depName=golang -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin/:$PATH @@ -71,7 +71,7 @@ ENV PATH=$PATH:/opt/apache-maven-${MAVEN_VER}/bin #### install tools: bazelisk, codecov, oras # renovate: datasource=github-tags depName=bazelbuild/bazelisk -ARG BAZELISK_VERSION=v1.22.1 +ARG BAZELISK_VERSION=v1.23.0 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL "https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${OS}-${ARCH}" -o /usr/local/bin/bazel && chmod +x /usr/local/bin/bazel diff --git a/dockerfiles/ci/release-build-base/Dockerfile b/dockerfiles/ci/release-build-base/Dockerfile index 8bbd8b86..e37e5fc6 100644 --- a/dockerfiles/ci/release-build-base/Dockerfile +++ b/dockerfiles/ci/release-build-base/Dockerfile @@ -55,7 +55,7 @@ RUN yum update --nogpgcheck -y && \ ##### install golang toolchain # renovate: datasource=docker depName=golang -ARG GOLANG_VERSION=1.23.2 +ARG GOLANG_VERSION=1.23.3 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL https://dl.google.com/go/go${GOLANG_VERSION}.linux-${ARCH}.tar.gz | tar -C /usr/local -xz ENV PATH /usr/local/go/bin/:$PATH @@ -74,7 +74,7 @@ RUN npm install -g yarn pnpm ##### install tools: bazelisk, yq, oras # renovate: datasource=github-tags depName=bazelbuild/bazelisk -ARG BAZELISK_VERSION=v1.22.1 +ARG BAZELISK_VERSION=v1.23.0 RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ curl -fsSL "https://github.com/bazelbuild/bazelisk/releases/download/${BAZELISK_VERSION}/bazelisk-${OS}-${ARCH}" -o /usr/local/bin/bazel && chmod +x /usr/local/bin/bazel @@ -96,7 +96,7 @@ RUN OS=linux; ARCH=$([ "$(arch)" = "x86_64" ] && echo amd64 || echo arm64); \ # go template tool # renovate: datasource=docker depName=hairyhenderson/gomplate -COPY --from=hairyhenderson/gomplate:v4.1.0 /gomplate /usr/local/bin/gomplate +COPY --from=hairyhenderson/gomplate:v4.2.0 /gomplate /usr/local/bin/gomplate # Set cmake3 as default cmake # renovate: datasource=github-tags depName=Kitware/CMake diff --git a/dockerfiles/ci/skaffold.yaml b/dockerfiles/ci/skaffold.yaml index 61aeebd6..e1ae1c4a 100644 --- a/dockerfiles/ci/skaffold.yaml +++ b/dockerfiles/ci/skaffold.yaml @@ -39,7 +39,7 @@ profiles: path: /build/artifacts/0/docker/buildArgs value: &value-go1-23 # renovate: datasource=docker depName=golang - GOLANG_VERSION: 1.23.2 + GOLANG_VERSION: 1.23.3 - op: add path: /build/artifacts/0/docker/buildArgs value: *value-go1-23 diff --git a/packages/packages.yaml.tmpl b/packages/packages.yaml.tmpl index 4499c280..1f06b286 100644 --- a/packages/packages.yaml.tmpl +++ b/packages/packages.yaml.tmpl @@ -1621,14 +1621,61 @@ components: - {{ .Release.version }} builders: - if: {{ semver.CheckConstraint ">= 8.4.0-0" .Release.version }} - image: ghcr.io/pingcap-qe/cd/builders/tiflash:v2024.10.8-14-g52a7228 + image: ghcr.io/pingcap-qe/cd/builders/tiflash:v2024.11.7 - if: {{ semver.CheckConstraint ">= 8.2.0-0, < 8.4.0-0" .Release.version }} image: hub.pingcap.net/ee/ci/release-build-base-tiflash:v20240625-llvm-17.0.6 - 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]