Explorar el Código

install toolchain in docker

Jorge Aparicio hace 8 años
padre
commit
d9deff7103
Se han modificado 3 ficheros con 7 adiciones y 12 borrados
  1. 0 9
      .travis.yml
  2. 5 1
      ci/install.sh
  3. 2 2
      ci/script.sh

+ 0 - 9
.travis.yml

@@ -62,17 +62,8 @@ matrix:
             - qemu-user-static
     - env: TARGET=powerpc64le-unknown-linux-gnu
       os: linux
-      dist: trusty
       services: docker
       sudo: required
-      addons:
-        apt:
-          packages:
-            - binfmt-support
-            - gcc-powerpc64le-linux-gnu
-            - libc6-ppc64el-cross
-            - libc6-dev-ppc64el-cross
-            - qemu-user
     - env: TARGET=x86_64-apple-darwin
       os: osx
     - env: TARGET=x86_64-unknown-linux-gnu

+ 5 - 1
ci/install.sh

@@ -25,7 +25,11 @@ install_c_toolchain() {
     case $TARGET in
         aarch64-unknown-linux-gnu)
             sudo apt-get install -y --no-install-recommends \
-                 gcc-aarch64-linux-gnu libc6-arm64-cross libc6-dev-arm64-cross
+                 gcc-aarch64-linux-gnu libc6-dev-arm64-cross
+            ;;
+        powerpc64-unknown-linux-gnu)
+            sudo apt-get install -y --no-install-recommends \
+                 gcc-powerpc64le-linux-gnu libc6-dev-ppc64le-cross
             ;;
         *)
             ;;

+ 2 - 2
ci/script.sh

@@ -36,9 +36,9 @@ main() {
         docker run \
                -e TARGET=$TARGET \
                -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
-               -v $(pwd)/ci:/mnt \
+               -v $(pwd):/mnt \
                ubuntu:16.04 \
-               sh -c "bash /mnt/install.sh; bash /mnt/script.sh"
+               sh -c "cd /mnt; bash ci/install.sh; bash ci/script.sh"
     else
         build
         run_tests