Skip to content

Commit af88cf1

Browse files
committed
Add a build task for FreeBSD11 without LIBC_CI
1 parent 4f1966f commit af88cf1

File tree

4 files changed

+23
-9
lines changed

4 files changed

+23
-9
lines changed

.cirrus.yml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
task:
2-
name: stable x86_64-unknown-freebsd-11
2+
name: stable x86_64-unknown-freebsd
33
freebsd_instance:
44
image: freebsd-11-3-stable-amd64-v20190801
55
setup_script:
@@ -11,6 +11,21 @@ task:
1111
test_script:
1212
- . $HOME/.cargo/env
1313
- sh ci/run.sh x86_64-unknown-freebsd
14+
15+
16+
task:
17+
name: stable x86_64-unknown-freebsd-11
18+
freebsd_instance:
19+
image: freebsd-11-3-stable-amd64-v20190801
20+
setup_script:
21+
- pkg install -y curl
22+
- curl https://sh.rustup.rs -sSf --output rustup.sh
23+
- sh rustup.sh -y
24+
- . $HOME/.cargo/env
25+
- rustup default stable
26+
test_script:
27+
- . $HOME/.cargo/env
28+
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd
1429

1530
task:
1631
name: nightly x86_64-unknown-freebsd-12
@@ -24,4 +39,4 @@ task:
2439
- rustup default nightly
2540
test_script:
2641
- . $HOME/.cargo/env
27-
- sh ci/run.sh x86_64-unknown-freebsd
42+
- LIBC_CI=1 sh ci/run.sh x86_64-unknown-freebsd

ci/azure.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
vmImage: ubuntu-16.04
1616
steps:
1717
- template: azure-install-rust.yml
18-
- bash: sh ./ci/run-docker.sh $TARGET
18+
- bash: LIBC_CI=1 sh ./ci/run-docker.sh $TARGET
1919
displayName: Execute run-docker.sh
2020
strategy:
2121
matrix:
@@ -30,7 +30,7 @@ jobs:
3030
vmImage: ubuntu-16.04
3131
steps:
3232
- template: azure-install-rust.yml
33-
- bash: sh ./ci/run-docker.sh $TARGET
33+
- bash: LIBC_CI=1 sh ./ci/run-docker.sh $TARGET
3434
displayName: Execute run-docker.sh
3535
strategy:
3636
matrix:
@@ -88,7 +88,7 @@ jobs:
8888
vmImage: macos-10.14
8989
steps:
9090
- template: azure-install-rust.yml
91-
- bash: sh ./ci/run.sh $TARGET
91+
- bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
9292
displayName: Execute run.sh
9393
strategy:
9494
matrix:
@@ -100,7 +100,7 @@ jobs:
100100
vmImage: macos-10.13
101101
steps:
102102
- template: azure-install-rust.yml
103-
- bash: sh ./ci/run.sh $TARGET
103+
- bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
104104
displayName: Execute run.sh
105105
strategy:
106106
matrix:
@@ -112,7 +112,7 @@ jobs:
112112
vmImage: vs2017-win2016
113113
steps:
114114
- template: azure-install-rust.yml
115-
- bash: sh ./ci/run.sh $TARGET
115+
- bash: LIBC_CI=1 sh ./ci/run.sh $TARGET
116116
displayName: Execute run.sh
117117
strategy:
118118
matrix:

ci/run-docker.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ run() {
2323
docker run \
2424
--rm \
2525
--user "$(id -u)":"$(id -g)" \
26+
--env LIBC_CI \
2627
--env CARGO_HOME=/cargo \
2728
--env CARGO_TARGET_DIR=/checkout/target \
2829
--volume "$(dirname "$(dirname "$(command -v cargo)")")":/cargo \

ci/run.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,6 @@ if [ "$TARGET" = "x86_64-unknown-linux-gnux32" ]; then
8787
opt="--release"
8888
fi
8989

90-
export LIBC_CI=1
91-
9290
cargo test -vv $opt --no-default-features --manifest-path libc-test/Cargo.toml \
9391
--target "${TARGET}"
9492

0 commit comments

Comments
 (0)