8000 use cargo vcpkg · RustPython/RustPython@63b1341 · GitHub
[go: up one dir, main page]

Skip to content

Commit 63b1341

Browse files
committed
use cargo vcpkg
1 parent 5218a02 commit 63b1341

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

.github/workflows/ci.yaml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,9 @@ jobs:
124124
with:
125125
components: clippy
126126
- name: Set up the Windows environment
127-
shell: bash
128127
run: |
129-
choco install llvm --no-progress
130-
choco install openssl --version=3.2.0 --no-progress
131-
if [[ -d "C:\Program Files\OpenSSL-Win64" ]]; then
132-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL-Win64" >> $GITHUB_ENV
133-
else
134-
echo "OPENSSL_DIR=C:\Program Files\OpenSSL" >> $GITHUB_ENV
135-
fi
128+
cargo install cargo-vcpkg
129+
cargo vcpkg build
136130
if: runner.os == 'Windows'
137131
- name: Set up the Mac environment
138132
run: brew install autoconf automake libtool

Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,3 +151,11 @@ lto = "thin"
151151
[patch.crates-io]
152152
# REDOX START, Uncomment when you want to compile/check with redoxer
153153
# REDOX END
154+
155+
[package.metadata.vcpkg]
156+
git = "https://github.com/microsoft/vcpkg"
157+
# https://github.com/microsoft/vcpkg/tags
158+
rev = "2024.02.14"
159+
160+
[package.metadata.vcpkg.target]
161+
x86_64-pc-windows-msvc = {dependencies=["openssl-windows", "openssl"]}

0 commit comments

Comments
 (0)
0