Skip to content

Commit 8bc1d31

Browse files
committed
Search for the docker package
1 parent 4f5640a commit 8bc1d31

File tree

2 files changed

+37
-40
lines changed

2 files changed

+37
-40
lines changed

.cirrus.yml

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -6,40 +6,39 @@ cargo_cache:
66
# same VM. The binary will be built in 32-bit mode, but will execute on a
77
# 64-bit kernel and in a 64-bit environment. Our tests don't execute any of
88
# the system's binaries, so the environment shouldn't matter.
9-
task:
10-
name: FreeBSD amd64
11-
freebsd_instance:
12-
image: freebsd-11-4-release-amd64
13-
# Install Rust
14-
setup_script:
15-
- fetch https://sh.rustup.rs -o rustup.sh
16-
- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
17-
- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
18-
amd64_test_script:
19-
- . $HOME/.cargo/env
20-
- cargo test
21-
i386_test_script:
22-
- . $HOME/.cargo/env
23-
- cargo test --target i686-unknown-freebsd
24-
before_cache_script: rm -rf $CARGO_HOME/registry/index
9+
#task:
10+
#name: FreeBSD amd64
11+
#freebsd_instance:
12+
#image: freebsd-11-4-release-amd64
13+
## Install Rust
14+
#setup_script:
15+
#- fetch https://sh.rustup.rs -o rustup.sh
16+
#- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
17+
#- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
18+
#amd64_test_script:
19+
#- . $HOME/.cargo/env
20+
#- cargo test
21+
#i386_test_script:
22+
#- . $HOME/.cargo/env
23+
#- cargo test --target i686-unknown-freebsd
24+
#before_cache_script: rm -rf $CARGO_HOME/registry/index
2525

26-
task:
27-
name: OSX x86_64
28-
env:
29-
RUST_TEST_THREADS: 1
30-
TARGET: x86_64-apple-darwin
31-
osx_instance:
32-
image: catalina-xcode
33-
setup_script:
34-
- which brew || true
35-
- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
36-
- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
37-
- . $HOME/.cargo/env
38-
- bash ci/install.sh
39-
script:
40-
- . $HOME/.cargo/env
41-
- bash ci/script.sh
42-
before_cache_script: rm -rf $CARGO_HOME/registry/index
26+
#task:
27+
#name: OSX x86_64
28+
#env:
29+
#RUST_TEST_THREADS: 1
30+
#TARGET: x86_64-apple-darwin
31+
#osx_instance:
32+
#image: catalina-xcode
33+
#setup_script:
34+
#- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
35+
#- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
36+
#- . $HOME/.cargo/env
37+
#- bash ci/install.sh
38+
#script:
39+
#- . $HOME/.cargo/env
40+
#- bash ci/script.sh
41+
#before_cache_script: rm -rf $CARGO_HOME/registry/index
4342

4443
task:
4544
env:
@@ -49,12 +48,13 @@ task:
4948
- name: Linux x86_64
5049
env:
5150
TARGET: x86_64-unknown-linux-gnu
52-
- name: Linux mipsel
53-
env:
54-
TARGET: mipsel-unknown-linux-gnu
51+
#- name: Linux mipsel
52+
#env:
53+
#TARGET: mipsel-unknown-linux-gnu
5554
container:
5655
image: rust:1.36
5756
setup_script:
57+
- apt search docker
5858
- apt-get install docker
5959
- bash ci/install.sh
6060
script:

ci/install.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@ main() {
55
local target=
66
if [ $CIRRUS_OS = linux ]; then
77
target=x86_64-unknown-linux-musl
8-
sort=sort
98
else
109
target=x86_64-apple-darwin
11-
sort=sort
12-
#sort=gsort # for `sort --sort-version`, from brew's coreutils.
1310
fi
1411

1512
# Builds for iOS are done on OSX, but require the specific target to be
@@ -39,7 +36,7 @@ main() {
3936
local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
4037
| cut -d/ -f3 \
4138
| grep -E '^v[0.1.0-9.]+$' \
42-
| $sort --version-sort \
39+
| sort --version-sort \
4340
| tail -n1)
4441
curl -LSfs https://japaric.github.io/trust/install.sh | \
4542
sh -s -- \

0 commit comments

Comments
 (0)