Skip to content

Commit 09028c4

Browse files
committed
Use cmd.exe to ensure that correct Perl executable is used
Signed-off-by: Alexander Rodin <rodin.alexander@gmail.com>
1 parent e5ef4ac commit 09028c4

File tree

2 files changed

+21
-11
lines changed

2 files changed

+21
-11
lines changed

.circleci/config.yml

+15-11
Original file line numberDiff line numberDiff line change
@@ -102,17 +102,21 @@ jobs:
102102
command: |
103103
msiexec /quiet /i perl-installer.msi
104104
del perl-installer.msi
105-
- run:
106-
name: Build and test
107-
shell: bash
108-
command: |
109-
RUSTFLAGS=-Ctarget-feature=+crt-static
110-
FEATURES="leveldb leveldb/leveldb-sys-3 rdkafka rdkafka/cmake_build"
111-
PATH="$HOME/.cargo/bin:$PATH"
112-
# see https://github.com/rust-lang/cargo/issues/2078
113-
printf '[net]\ngit-fetch-with-cli = true\n' > "$HOME/.cargo/config"
114-
rm rust-toolchain # to use nightly
115-
cargo test --no-default-features --features "$FEATURES"
105+
- run:
106+
name: Build and test
107+
shell: cmd.exe
108+
command: scripts\test-msvc.bat
109+
# - run:
110+
# name: Build and test
111+
# shell: bash
112+
# command: |
113+
# RUSTFLAGS=-Ctarget-feature=+crt-static
114+
# FEATURES="leveldb leveldb/leveldb-sys-3 rdkafka rdkafka/cmake_build"
115+
# PATH="$HOME/.cargo/bin:$PATH"
116+
# # see https://github.com/rust-lang/cargo/issues/2078
117+
# printf '[net]\ngit-fetch-with-cli = true\n' > "$HOME/.cargo/config"
118+
# rm rust-toolchain # to use nightly
119+
# cargo test --no-default-features --features "$FEATURES"
116120

117121
test-stable:
118122
resource_class: xlarge

scripts/test-msvc.bat

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
set RUSTFLAGS=-Ctarget-feature=+crt-static
2+
set PATH=%USERPROFILE%\.cargo\bin;%PATH%
3+
echo [net] > %USERPROFILE%\.cargo\config
4+
echo git-fetch-with-cli = true >> %USERPROFILE\.cargo\config
5+
del rust-toolchain
6+
cargo test --no-default-features --features "leveldb leveldb/leveldb-sys-3 rdkafka rdkafka/cmake_build"

0 commit comments

Comments
 (0)