Skip to content

Commit 0c911a5

Browse files
committed
Revert "Re-enable cmake 4.1.2 and use install_vcpkg.sh to install vcpkg"
This reverts commit dfea377.
1 parent bc62a23 commit 0c911a5

File tree

2 files changed

+24
-26
lines changed

2 files changed

+24
-26
lines changed

.github/workflows/cpp_extra.yml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -389,41 +389,40 @@ jobs:
389389
path: ${{ steps.ccache-info.outputs.cache-dir }}
390390
key: cpp-odbc-ccache-windows-x64-${{ hashFiles('cpp/**') }}
391391
restore-keys: cpp-odbc-ccache-windows-x64-
392-
- name: Install cmake
393-
shell: bash
394-
run: |
395-
ci/scripts/install_cmake.sh 4.1.2 /usr
396-
- name: Retrieve VCPKG version from arrow/.env
397-
shell: bash
398-
run: |
399-
vcpkg_version=$(. ".env" && echo "${VCPKG}")
400-
echo "VCPKG_VERSION=$vcpkg_version" >> $GITHUB_ENV
401-
- name: Set Vcpkg PATH
402-
shell: pwsh
403-
run: |
404-
echo "VCPKG_ROOT=${{ github.workspace }}\vcpkg" >> $env:GITHUB_ENV
405-
- name: Install Vcpkg
406-
env:
407-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
408-
shell: bash
409-
run: |
410-
ci/scripts/install_vcpkg.sh $VCPKG_ROOT $VCPKG_VERSION
411-
- name: Show vcpkg NuGet pwsh
412-
shell: pwsh
392+
- name: Checkout vcpkg
393+
uses: actions/checkout@v6
394+
with:
395+
fetch-depth: 0
396+
path: vcpkg
397+
repository: microsoft/vcpkg
398+
- name: Bootstrap vcpkg
413399
run: |
414-
vcpkg fetch nuget
415-
- name: Show vcpkg NuGet bash
400+
vcpkg\bootstrap-vcpkg.bat
401+
$VCPKG_ROOT = $(Resolve-Path -LiteralPath "vcpkg").ToString()
402+
Write-Output ${VCPKG_ROOT} | `
403+
Out-File -FilePath ${Env:GITHUB_PATH} -Encoding utf8 -Append
404+
Write-Output "VCPKG_ROOT=${VCPKG_ROOT}" | `
405+
Out-File -FilePath ${Env:GITHUB_ENV} -Encoding utf8 -Append
406+
- name: Setup NuGet credentials for vcpkg caching
416407
shell: bash
417408
run: |
418-
vcpkg fetch nuget
409+
$(vcpkg fetch nuget | tail -n 1) \
410+
sources add \
411+
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
412+
-storepasswordincleartext \
413+
-name "GitHub" \
414+
-username "$GITHUB_REPOSITORY_OWNER" \
415+
-password "${{ secrets.GITHUB_TOKEN }}"
416+
$(vcpkg fetch nuget | tail -n 1) \
417+
setapikey "${{ secrets.GITHUB_TOKEN }}" \
418+
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
419419
- name: Build
420420
shell: cmd
421421
run: |
422422
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
423423
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
424424
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%
425425
bash -c "ci/scripts/cpp_build.sh $(pwd) $(pwd)/build"
426-
427426
- name: Register Flight SQL ODBC Driver
428427
shell: cmd
429428
run: |

.github/workflows/ruby.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ jobs:
425425
- name: Build C++
426426
shell: cmd
427427
run: |
428-
$env:VCPKG_DEBUG = "1"
429428
set VCPKG_ROOT_KEEP=%VCPKG_ROOT%
430429
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
431430
set VCPKG_ROOT=%VCPKG_ROOT_KEEP%

0 commit comments

Comments
 (0)