Skip to content

Commit 6d15b46

Browse files
committed
try using vcpkg on mac
1 parent 2eaf6d6 commit 6d15b46

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

.github/workflows/jarbuild.yml

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -205,14 +205,17 @@ jobs:
205205
python-version: 3.12
206206
- name: Install Archery
207207
run: pip install -e arrow/dev/archery[all]
208+
- name: Checkout vcpkg
209+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
210+
with:
211+
repository: Microsoft/vcpkg
212+
path: arrow/cpp/submodules/vcpkg
208213
- name: Install vcpkg
209214
run: |
210-
# Install vcpkg
211-
git clone https://github.com/Microsoft/vcpkg.git /usr/local/vcpkg
212-
cd /usr/local/vcpkg
215+
cd arrow/cpp/submodules/vcpkg
213216
./bootstrap-vcpkg.sh
214-
echo "VCPKG_ROOT=/usr/local/vcpkg" >> ${GITHUB_ENV}
215-
echo "/usr/local/vcpkg" >> ${GITHUB_PATH}
217+
echo "VCPKG_ROOT=${PWD}/arrow/cpp/submodules/vcpkg" >> ${GITHUB_ENV}
218+
echo "${PWD}/arrow/cpp/submodules/vcpkg" >> ${GITHUB_PATH}
216219
- name: Install dependencies
217220
run: |
218221
# Clean up any existing LLVM installations
@@ -234,7 +237,7 @@ jobs:
234237
brew install cmake ninja pkg-config
235238
236239
# Use vcpkg to install LLVM and other dependencies
237-
export VCPKG_ROOT=/usr/local/vcpkg
240+
# export VCPKG_ROOT=/usr/local/vcpkg
238241
vcpkg install \
239242
--clean-after-build \
240243
--x-install-root=${VCPKG_ROOT}/installed \
@@ -270,7 +273,7 @@ jobs:
270273
run: |
271274
set -e
272275
# Set up vcpkg environment
273-
export VCPKG_ROOT=/usr/local/vcpkg
276+
# export VCPKG_ROOT=/usr/local/vcpkg
274277
export VCPKG_OVERLAY_PORTS=arrow/ci/vcpkg/overlay/llvm
275278
export CMAKE_TOOLCHAIN_FILE=${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake
276279

0 commit comments

Comments
 (0)