This is an automated email from the ASF dual-hosted git repository.
yuanzhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-gluten.git
The following commit(s) were added to refs/heads/main by this push:
new 823336dad [CI][VL] Update docker image for CI (#6401)
823336dad is described below
commit 823336dadf32724fdf05e4a11e715267ba81e8cb
Author: Yuan <[email protected]>
AuthorDate: Fri Jul 12 18:19:55 2024 +0800
[CI][VL] Update docker image for CI (#6401)
* Upgrade vcpkg folly version to 2024.05.20
---------
Signed-off-by: Yuan Zhou <[email protected]>
Co-authored-by: rexan <[email protected]>
---
.github/workflows/velox_docker.yml | 3 ++-
dev/vcpkg/ports/folly/fix-unistd-include.patch | 2 +-
dev/vcpkg/ports/folly/fix-windows-minmax.patch | 2 +-
dev/vcpkg/ports/folly/portfile.cmake | 2 +-
dev/vcpkg/ports/folly/vcpkg.json | 2 +-
5 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/.github/workflows/velox_docker.yml
b/.github/workflows/velox_docker.yml
index 116503ad2..f6e2ae076 100644
--- a/.github/workflows/velox_docker.yml
+++ b/.github/workflows/velox_docker.yml
@@ -52,7 +52,7 @@ concurrency:
jobs:
build-native-lib-centos-7:
runs-on: ubuntu-20.04
- container: apache/gluten:gluten-vcpkg-builder_2024_05_29 # centos7 with
dependencies installed
+ container: apache/gluten:gluten-vcpkg-builder_2024_07_11 # centos7 with
dependencies installed
steps:
- uses: actions/checkout@v2
- name: Generate cache key
@@ -69,6 +69,7 @@ jobs:
- name: Build Gluten Velox third party
if: ${{ steps.cache.outputs.cache-hit != 'true' }}
run: |
+ df -a
source dev/ci-velox-buildstatic.sh
- name: Upload Artifact Native
uses: actions/upload-artifact@v2
diff --git a/dev/vcpkg/ports/folly/fix-unistd-include.patch
b/dev/vcpkg/ports/folly/fix-unistd-include.patch
index 9e3fe5d7a..78a4e0923 100644
--- a/dev/vcpkg/ports/folly/fix-unistd-include.patch
+++ b/dev/vcpkg/ports/folly/fix-unistd-include.patch
@@ -1,5 +1,5 @@
diff --git a/folly/experimental/symbolizer/Elf.cpp
b/folly/experimental/symbolizer/Elf.cpp
-index 6a7f74f..6546fe0 100644
+index 6a7f74fa4..6546fe074 100644
--- a/folly/experimental/symbolizer/Elf.cpp
+++ b/folly/experimental/symbolizer/Elf.cpp
@@ -49,6 +49,8 @@
diff --git a/dev/vcpkg/ports/folly/fix-windows-minmax.patch
b/dev/vcpkg/ports/folly/fix-windows-minmax.patch
index 1fc69a43a..24e4b9eac 100644
--- a/dev/vcpkg/ports/folly/fix-windows-minmax.patch
+++ b/dev/vcpkg/ports/folly/fix-windows-minmax.patch
@@ -1,5 +1,5 @@
diff --git a/CMake/FollyCompilerMSVC.cmake b/CMake/FollyCompilerMSVC.cmake
-index ec2ce1a1d..16deda71c 100644
+index ad03039aa..1c76e0f00 100644
--- a/CMake/FollyCompilerMSVC.cmake
+++ b/CMake/FollyCompilerMSVC.cmake
@@ -289,6 +289,7 @@ function(apply_folly_compile_options_to_target THETARGET)
diff --git a/dev/vcpkg/ports/folly/portfile.cmake
b/dev/vcpkg/ports/folly/portfile.cmake
index 40a0231ea..44a9ce497 100644
--- a/dev/vcpkg/ports/folly/portfile.cmake
+++ b/dev/vcpkg/ports/folly/portfile.cmake
@@ -9,7 +9,7 @@ vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO facebook/folly
REF "v${VERSION}"
- SHA512
6f4fa9b30ff0aba4c1c89619ada2cafd8943ba9a06b6ac4086fba212f26f0df606c8735485110eec6977900d45fc33ddcfdb8095dc6728b8c12b5cac65672e12
+ SHA512
a305ac3d76a248b47428907a2e1115ca08bfd17f1e109ef187b1a52a1c121031495af61ffac1ffb9760e584f86df5b255f0eb9c0c19f75b1a1be01c9aec85a66
HEAD_REF main
PATCHES
boost-1.70.patch
diff --git a/dev/vcpkg/ports/folly/vcpkg.json b/dev/vcpkg/ports/folly/vcpkg.json
index b908f40dd..c3f14ffb3 100644
--- a/dev/vcpkg/ports/folly/vcpkg.json
+++ b/dev/vcpkg/ports/folly/vcpkg.json
@@ -1,6 +1,6 @@
{
"name": "folly",
- "version-string": "2024.04.01.00",
+ "version-string": "2024.05.20.00",
"description": "An open-source C++ library developed and used at Facebook.
The library is UNSTABLE on Windows",
"homepage": "https://github.com/facebook/folly";,
"license": "Apache-2.0",
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
