From 696a8251f3fc8c98cf81062d4b01aec82121b5ef Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 26 Jun 2026 19:34:52 +0100 Subject: [PATCH 1/5] [VL] Remove unused CI images Signed-off-by: Yuan --- .github/workflows/docker_image.yml | 78 +------------------ .../Dockerfile.centos8-gcc13-static-build | 3 +- dev/docker/Dockerfile.centos9-static-build | 3 +- 3 files changed, 3 insertions(+), 81 deletions(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index df3e00e1b7d..4b8adfc8a22 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -33,31 +33,6 @@ env: DOCKERHUB_REPO: apache/gluten jobs: - build-vcpkg-centos-7: - if: ${{ startsWith(github.repository, 'apache/') }} - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v6 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd - - - name: Login to Docker Hub - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push Docker image - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf - with: - context: . - file: dev/docker/Dockerfile.centos7-static-build - push: true - tags: ${{ env.DOCKERHUB_REPO }}:vcpkg-centos-7 - build-vcpkg-centos-7-gcc13: if: ${{ startsWith(github.repository, 'apache/') }} runs-on: ubuntu-latest @@ -170,56 +145,6 @@ jobs: push: true tags: ${{ env.DOCKERHUB_REPO }}:centos-9-jdk17-cuda12.9-cudf - build-vcpkg-centos-8: - if: ${{ startsWith(github.repository, 'apache/') }} - runs-on: ${{ matrix.os }} - strategy: - matrix: - os: [ ubuntu-latest, ubuntu-24.04-arm ] - - steps: - - name: Checkout repository - uses: actions/checkout@v6 - - - name: Docker meta - id: meta - uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf - with: - images: ${{ env.DOCKERHUB_REPO }} - tags: vcpkg-centos-8 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd - - - name: Login to Docker Hub - uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee - with: - username: ${{ secrets.DOCKERHUB_USER }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push by digest - id: build - uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf - with: - context: . - file: dev/docker/Dockerfile.centos8-static-build - labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,"name=${{ env.DOCKERHUB_REPO }}",push-by-digest=true,push=true - - - name: Export digest - run: | - mkdir -p ${{ runner.temp }}/digests - digest="${{ steps.build.outputs.digest }}" - touch "${{ runner.temp }}/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-vcpkg-centos-8-${{ matrix.os }} - path: ${{ runner.temp }}/digests/* - if-no-files-found: error - retention-days: 1 - build-vcpkg-centos-8-gcc13: if: ${{ startsWith(github.repository, 'apache/') }} runs-on: ${{ matrix.os }} @@ -451,9 +376,8 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - digests: [ vcpkg-centos-8, vcpkg-centos-9 ] + digests: [ vcpkg-centos-9 ] needs: - - build-vcpkg-centos-8 - build-vcpkg-centos-9 steps: diff --git a/dev/docker/Dockerfile.centos8-gcc13-static-build b/dev/docker/Dockerfile.centos8-gcc13-static-build index a2e5bdf040f..150aee46c2e 100644 --- a/dev/docker/Dockerfile.centos8-gcc13-static-build +++ b/dev/docker/Dockerfile.centos8-gcc13-static-build @@ -28,9 +28,8 @@ RUN set -ex; \ yum update -y && yum install -y epel-release sudo dnf && yum install -y ccache; \ echo "check_certificate = off" >> ~/.wgetrc; \ yum install -y java-1.8.0-openjdk-devel patch git perl python3 automake libtool flex; \ - dnf -y --enablerepo=powertools install autoconf-archive ninja-build; \ + dnf -y --enablerepo=powertools install autoconf-archive ninja-build cmake; \ pip3 install --upgrade pip; \ - pip3 install cmake==3.31.4; \ rpm -qa | grep tzdata; \ dnf clean all; \ git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ diff --git a/dev/docker/Dockerfile.centos9-static-build b/dev/docker/Dockerfile.centos9-static-build index 1fbda664f2d..c83c99a465a 100644 --- a/dev/docker/Dockerfile.centos9-static-build +++ b/dev/docker/Dockerfile.centos9-static-build @@ -26,8 +26,7 @@ ENV VCPKG_BINARY_SOURCES=clear;files,${VCPKG_PATH},readwrite RUN set -ex; \ yum update -y && yum install -y epel-release sudo dnf && yum install -y ccache; \ - dnf install -y --setopt=install_weak_deps=False gcc-toolset-12 gcc-toolset-13 perl-FindBin; \ - pip install cmake==3.31.4; \ + dnf install -y --setopt=install_weak_deps=False gcc-toolset-12 gcc-toolset-13 perl-FindBin cmake; \ echo "check_certificate = off" >> ~/.wgetrc; \ yum install -y java-17-openjdk-devel patch git perl; \ dnf clean all; \ From c3d0cdb5807c79cc3c60a944c45e87595e9bfcea Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 26 Jun 2026 20:56:41 +0100 Subject: [PATCH 2/5] test Signed-off-by: Yuan --- .github/workflows/docker_image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 4b8adfc8a22..056a6ef9b57 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -146,7 +146,7 @@ jobs: tags: ${{ env.DOCKERHUB_REPO }}:centos-9-jdk17-cuda12.9-cudf build-vcpkg-centos-8-gcc13: - if: ${{ startsWith(github.repository, 'apache/') }} + runs-on: ${{ matrix.os }} strategy: matrix: @@ -196,7 +196,7 @@ jobs: retention-days: 1 build-vcpkg-centos-9: - if: ${{ startsWith(github.repository, 'apache/') }} + runs-on: ${{ matrix.os }} strategy: matrix: From b2dd329fd1662cc16147fe834900ce38784f3014 Mon Sep 17 00:00:00 2001 From: Yuan Date: Fri, 26 Jun 2026 21:00:47 +0100 Subject: [PATCH 3/5] fix Signed-off-by: Yuan fix Signed-off-by: Yuan --- dev/docker/Dockerfile.centos8-gcc13-static-build | 9 ++++++--- dev/docker/Dockerfile.centos9-static-build | 2 +- dev/vcpkg/setup-build-depends.sh | 5 ----- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/dev/docker/Dockerfile.centos8-gcc13-static-build b/dev/docker/Dockerfile.centos8-gcc13-static-build index 150aee46c2e..764ce78bc8a 100644 --- a/dev/docker/Dockerfile.centos8-gcc13-static-build +++ b/dev/docker/Dockerfile.centos8-gcc13-static-build @@ -28,11 +28,14 @@ RUN set -ex; \ yum update -y && yum install -y epel-release sudo dnf && yum install -y ccache; \ echo "check_certificate = off" >> ~/.wgetrc; \ yum install -y java-1.8.0-openjdk-devel patch git perl python3 automake libtool flex; \ - dnf -y --enablerepo=powertools install autoconf-archive ninja-build cmake; \ - pip3 install --upgrade pip; \ + dnf -y --enablerepo=powertools install autoconf-archive ninja-build; \ + wget https://github.com/Kitware/CMake/releases/download/v3.31.12/cmake-3.31.12-linux-$(uname -m).sh; \ + chmod +x cmake-3.31.12-linux-$(uname -m).sh; \ + ./cmake-3.31.12-linux-$(uname -m).sh --skip-license --prefix=/usr/local; \ + rm -f cmake-3.31.12-linux-$(uname -m).sh; \ rpm -qa | grep tzdata; \ dnf clean all; \ - git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ + git clone --depth=1 https://github.com/zhouyuan/gluten /opt/gluten; \ mkdir -p ${VCPKG_PATH}; \ echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \ if [ "$(uname -m)" = "aarch64" ]; then \ diff --git a/dev/docker/Dockerfile.centos9-static-build b/dev/docker/Dockerfile.centos9-static-build index c83c99a465a..d351094f592 100644 --- a/dev/docker/Dockerfile.centos9-static-build +++ b/dev/docker/Dockerfile.centos9-static-build @@ -30,7 +30,7 @@ RUN set -ex; \ echo "check_certificate = off" >> ~/.wgetrc; \ yum install -y java-17-openjdk-devel patch git perl; \ dnf clean all; \ - git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ + git clone --depth=1 https://github.com/zhouyuan/gluten /opt/gluten; \ cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \ mkdir -p ${VCPKG_PATH}; \ echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \ diff --git a/dev/vcpkg/setup-build-depends.sh b/dev/vcpkg/setup-build-depends.sh index 1a5ed490138..473f8260aac 100755 --- a/dev/vcpkg/setup-build-depends.sh +++ b/dev/vcpkg/setup-build-depends.sh @@ -157,9 +157,6 @@ install_centos_8() { pip3 install --upgrade pip - # Requires cmake >= 3.28.3 - pip3 install cmake==3.28.3 - dnf -y --enablerepo=powertools install autoconf-archive ninja-build install_maven_from_source @@ -175,8 +172,6 @@ install_centos_9() { pip3 install --upgrade pip - # Requires cmake >= 3.28.3 - pip3 install cmake==3.28.3 dnf -y --enablerepo=crb install autoconf-archive ninja-build From 435cd5ff320c086a4cce75406dcd3483f56119e2 Mon Sep 17 00:00:00 2001 From: Yuan Date: Sat, 27 Jun 2026 08:22:33 +0100 Subject: [PATCH 4/5] revert Signed-off-by: Yuan --- dev/docker/Dockerfile.centos8-gcc13-static-build | 2 +- dev/docker/Dockerfile.centos9-static-build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/docker/Dockerfile.centos8-gcc13-static-build b/dev/docker/Dockerfile.centos8-gcc13-static-build index 764ce78bc8a..37e609f64a1 100644 --- a/dev/docker/Dockerfile.centos8-gcc13-static-build +++ b/dev/docker/Dockerfile.centos8-gcc13-static-build @@ -35,7 +35,7 @@ RUN set -ex; \ rm -f cmake-3.31.12-linux-$(uname -m).sh; \ rpm -qa | grep tzdata; \ dnf clean all; \ - git clone --depth=1 https://github.com/zhouyuan/gluten /opt/gluten; \ + git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ mkdir -p ${VCPKG_PATH}; \ echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \ if [ "$(uname -m)" = "aarch64" ]; then \ diff --git a/dev/docker/Dockerfile.centos9-static-build b/dev/docker/Dockerfile.centos9-static-build index d351094f592..c83c99a465a 100644 --- a/dev/docker/Dockerfile.centos9-static-build +++ b/dev/docker/Dockerfile.centos9-static-build @@ -30,7 +30,7 @@ RUN set -ex; \ echo "check_certificate = off" >> ~/.wgetrc; \ yum install -y java-17-openjdk-devel patch git perl; \ dnf clean all; \ - git clone --depth=1 https://github.com/zhouyuan/gluten /opt/gluten; \ + git clone --depth=1 https://github.com/apache/gluten /opt/gluten; \ cd /opt/gluten && bash ./dev/vcpkg/setup-build-depends.sh; \ mkdir -p ${VCPKG_PATH}; \ echo "Build arrow, then install the native libs to system paths and jar package to .m2/ directory."; \ From d8ed6b506c8031260d2f2727e9d69f6489058096 Mon Sep 17 00:00:00 2001 From: Yuan Date: Sat, 27 Jun 2026 08:22:47 +0100 Subject: [PATCH 5/5] Revert "test" This reverts commit c3d0cdb5807c79cc3c60a944c45e87595e9bfcea. --- .github/workflows/docker_image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker_image.yml b/.github/workflows/docker_image.yml index 056a6ef9b57..4b8adfc8a22 100644 --- a/.github/workflows/docker_image.yml +++ b/.github/workflows/docker_image.yml @@ -146,7 +146,7 @@ jobs: tags: ${{ env.DOCKERHUB_REPO }}:centos-9-jdk17-cuda12.9-cudf build-vcpkg-centos-8-gcc13: - + if: ${{ startsWith(github.repository, 'apache/') }} runs-on: ${{ matrix.os }} strategy: matrix: @@ -196,7 +196,7 @@ jobs: retention-days: 1 build-vcpkg-centos-9: - + if: ${{ startsWith(github.repository, 'apache/') }} runs-on: ${{ matrix.os }} strategy: matrix: