Skip to content

Commit

Permalink
Simplify
Browse files Browse the repository at this point in the history
  • Loading branch information
kou committed Nov 6, 2024
1 parent 801cdfd commit 00a007f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
1 change: 0 additions & 1 deletion ci/docker/python-wheel-manylinux.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,6 @@ COPY ci/vcpkg/vcpkg.json arrow/ci/vcpkg/
# previous versions => use bundled S3 build
RUN vcpkg install \
--clean-after-build \
--debug \
--x-install-root=${VCPKG_ROOT}/installed \
--x-manifest-root=/arrow/ci/vcpkg \
--x-feature=azure \
Expand Down
12 changes: 7 additions & 5 deletions ci/scripts/install_vcpkg.sh
Original file line number Diff line number Diff line change
Expand Up @@ -57,20 +57,22 @@ if [ -n "${GITHUB_TOKEN:-}" ] && [ -n "${GITHUB_REPOSITORY_OWNER:-}" ]; then
if type dnf 2>/dev/null; then
dnf install -y epel-release
dnf install -y mono-complete
wget --no-verbose https://dist.nuget.org/win-x86-commandline/v6.10.0/nuget.exe
mv nuget.exe /usr/bin/nuget
chmod +x /usr/bin/nuget
curl \
--location \
--output "${vcpkg_destination}/nuget" \
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 /usr/bin/nuget \
mono $(vcpkg fetch nuget | tail -n 1) \
sources add \
-source "${nuget_url}" \
-storepasswordincleartext \
-name "GitHub" \
-username "${GITHUB_REPOSITORY_OWNER}" \
-password "${GITHUB_TOKEN}"
mono /usr/bin/nuget \
mono $(vcpkg fetch nuget | tail -n 1) \
setapikey "${GITHUB_TOKEN}" \
-source "${nuget_url}"
fi
Expand Down

0 comments on commit 00a007f

Please sign in to comment.