Skip to content

Commit

Permalink
Reuse cache setup
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Nov 7, 2024
1 parent 00a007f commit d865f52
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 17 deletions.
1 change: 0 additions & 1 deletion ci/scripts/install_vcpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ if [ -n "${GITHUB_TOKEN:-}" ] && [ -n "${GITHUB_REPOSITORY_OWNER:-}" ]; then
https://dist.nuget.org/win-x86-commandline/latest/nuget.exe
fi
PATH="${vcpkg_destination}:${PATH}"
vcpkg fetch nuget || :
nuget_url="https://nuget.pkg.github.com/${GITHUB_REPOSITORY_OWNER}/index.json"
mono $(vcpkg fetch nuget | tail -n 1) \
sources add \
Expand Down
18 changes: 2 additions & 16 deletions dev/tasks/python-wheels/github.osx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -69,27 +69,13 @@ jobs:
echo "VCPKG_VERSION=$vcpkg_version" >> $GITHUB_ENV
- name: Install Vcpkg
env:
GITHUB_TOKEN: {{ '${{ secrets.GITHUB_TOKEN }}' }}
run: arrow/ci/scripts/install_vcpkg.sh $VCPKG_ROOT $VCPKG_VERSION

- name: Add Vcpkg to PATH
run: echo ${VCPKG_ROOT} >> $GITHUB_PATH

- name: Setup NuGet Credentials
env:
GITHUB_TOKEN: {{ '${{ secrets.GITHUB_TOKEN }}' }}
run: |
mono $(vcpkg fetch nuget | tail -n 1) \
sources add \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json" \
-storepasswordincleartext \
-name "GitHub" \
-username "$GITHUB_REPOSITORY_OWNER" \
-password "$GITHUB_TOKEN" \
mono $(vcpkg fetch nuget | tail -n 1) \
setapikey "$GITHUB_TOKEN" \
-source "https://nuget.pkg.github.com/$GITHUB_REPOSITORY_OWNER/index.json"
- name: Install Packages
run: |
vcpkg install \
Expand Down

0 comments on commit d865f52

Please sign in to comment.