Search for the docker package

nix-rust · Dec 3, 2020 · 8bc1d31 · 8bc1d31
1 parent 4f5640a
commit 8bc1d31
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 40 deletions.
diff --git a/.cirrus.yml b/.cirrus.yml
@@ -6,40 +6,39 @@ cargo_cache:
 # same VM.  The binary will be built in 32-bit mode, but will execute on a
 # 64-bit kernel and in a 64-bit environment.  Our tests don't execute any of
 # the system's binaries, so the environment shouldn't matter.
-task:
-  name: FreeBSD amd64
-  freebsd_instance:
-    image: freebsd-11-4-release-amd64
-  # Install Rust
-  setup_script:
-    - fetch https://sh.rustup.rs -o rustup.sh
-    - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
-    - $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
-  amd64_test_script:
-    - . $HOME/.cargo/env
-    - cargo test
-  i386_test_script:
-    - . $HOME/.cargo/env
-    - cargo test --target i686-unknown-freebsd
-  before_cache_script: rm -rf $CARGO_HOME/registry/index
+#task:
+  #name: FreeBSD amd64
+  #freebsd_instance:
+    #image: freebsd-11-4-release-amd64
+  ## Install Rust
+  #setup_script:
+    #- fetch https://sh.rustup.rs -o rustup.sh
+    #- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
+    #- $HOME/.cargo/bin/rustup target add i686-unknown-freebsd
+  #amd64_test_script:
+    #- . $HOME/.cargo/env
+    #- cargo test
+  #i386_test_script:
+    #- . $HOME/.cargo/env
+    #- cargo test --target i686-unknown-freebsd
+  #before_cache_script: rm -rf $CARGO_HOME/registry/index
 
-task:
-  name: OSX x86_64
-  env:
-    RUST_TEST_THREADS: 1
-    TARGET: x86_64-apple-darwin
-  osx_instance:
-    image: catalina-xcode
-  setup_script:
-    - which brew || true
-    - curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
-    - sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
-    - . $HOME/.cargo/env
-    - bash ci/install.sh
-  script:
-    - . $HOME/.cargo/env
-    - bash ci/script.sh
-  before_cache_script: rm -rf $CARGO_HOME/registry/index
+#task:
+  #name: OSX x86_64
+  #env:
+    #RUST_TEST_THREADS: 1
+    #TARGET: x86_64-apple-darwin
+  #osx_instance:
+    #image: catalina-xcode
+  #setup_script:
+    #- curl --proto '=https' --tlsv1.2 -sSf -o rustup.sh https://sh.rustup.rs
+    #- sh rustup.sh -y --profile=minimal --default-toolchain 1.36.0
+    #- . $HOME/.cargo/env
+    #- bash ci/install.sh
+  #script:
+    #- . $HOME/.cargo/env
+    #- bash ci/script.sh
+  #before_cache_script: rm -rf $CARGO_HOME/registry/index
 
 task:
   env:
@@ -49,12 +48,13 @@ task:
     - name: Linux x86_64
       env:
         TARGET: x86_64-unknown-linux-gnu
-    - name: Linux mipsel
-      env:
-        TARGET: mipsel-unknown-linux-gnu
+    #- name: Linux mipsel
+      #env:
+        #TARGET: mipsel-unknown-linux-gnu
   container:
     image: rust:1.36
   setup_script:
+    - apt search docker
     - apt-get install docker
     - bash ci/install.sh
   script:

diff --git a/ci/install.sh b/ci/install.sh
@@ -5,11 +5,8 @@ main() {
     local target=
     if [ $CIRRUS_OS = linux ]; then
         target=x86_64-unknown-linux-musl
-        sort=sort
     else
         target=x86_64-apple-darwin
-        sort=sort
-        #sort=gsort  # for `sort --sort-version`, from brew's coreutils.
     fi
 
     # Builds for iOS are done on OSX, but require the specific target to be
@@ -39,7 +36,7 @@ main() {
     local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
                        | cut -d/ -f3 \
                        | grep -E '^v[0.1.0-9.]+$' \
-                       | $sort --version-sort \
+                       | sort --version-sort \
                        | tail -n1)
     curl -LSfs https://japaric.github.io/trust/install.sh | \
         sh -s -- \