Skip to content

Commit 3bb7de0

Browse files
committed
Fix Perl path
Signed-off-by: Alexander Rodin <rodin.alexander@gmail.com>
1 parent 5fa0ec0 commit 3bb7de0

File tree

2 files changed

+10
-13
lines changed

2 files changed

+10
-13
lines changed

.circleci/config.yml

+10-9
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,25 @@ jobs:
9191
# see https://github.com/rust-lang/cargo/issues/2078
9292
printf '[net]\ngit-fetch-with-cli = true\n' > "$HOME/.cargo/config"
9393
- run:
94-
name: Download Perl
94+
name: Install Perl
9595
shell: bash
9696
command: |
9797
VERSION=5.30.0.1
9898
# we need to verify checksum because strawberryperl.com doesn't support HTTPS
9999
SHA256SUM=459de13a284a4c83213208c9caa1c372c81136b6e863a3f13d42f631048e0b12
100100
curl http://strawberryperl.com/download/$VERSION/strawberry-perl-$VERSION-64bit.msi > perl-installer.msi
101101
echo "$SHA256SUM perl-installer.msi" | sha256sum --check --status
102-
- run:
103-
name: Install Perl
104-
shell: cmd.exe
105-
command: |
106-
msiexec /quiet /i perl-installer.msi
107-
del perl-installer.msi
102+
msiexec -quiet -i perl-installer.msi
103+
rm perl-installer.msi
108104
- run:
109105
name: Build and test
110-
shell: cmd.exe
111-
command: scripts\test-msvc.bat
106+
shell: bash
107+
command: |
108+
RUSTFLAGS=-Ctarget-feature=+crt-static
109+
PATH="$HOME/.cargo/bin:/c/Strawberry/perl/bin:$PATH"
110+
FEATURES="leveldb leveldb/leveldb-sys-3 rdkafka rdkafka/cmake_build"
111+
rm rust-toolchain
112+
cargo test --no-default-features --features "$FEATURES"
112113
# - run:
113114
# name: Build and test
114115
# shell: bash

scripts/test-msvc.bat

-4
This file was deleted.

0 commit comments

Comments
 (0)