Merge pull request #18 from isuruf/other_arch

x86_64 and ppc64le

Author: isuruf

.travis.yml

@@ -5,8 +5,20 @@ matrix:
     - os: linux
       env:
         - ARCH=aarch64
+        - DOCKER_ARCH=arm64v8
         - DOCKERIMAGE=condaforge/linux-anvil-aarch64
-        - QEMU_BINARY=qemu-aarch64-static
+
+    - os: linux
+      env:
+        - ARCH=x86_64
+        - DOCKER_ARCH=amd64
+        - DOCKERIMAGE=condaforge/linux-anvil-comp7
+
+    - os: linux
+      env:
+        - ARCH=ppc64le
+        - DOCKER_ARCH=ppc64le
+        - DOCKERIMAGE=condaforge/linux-anvil-ppc64le
 
 script:
   - bash build_miniforge.sh

Miniforge3/construct.yaml

@@ -1,11 +1,8 @@
 name: Miniforge3
-version: 4.8.2-0
+version: 4.8.2-1
 
 channels:
   - https://conda.anaconda.org/conda-forge
-  # This will continue to be a dependency until the compilers are
-  # moved to conda-forge.
-  - https://conda.anaconda.org/c4aarch64   [linux-aarch64]
 
 write_condarc: True
 license_file: ../LICENSE

README.md

@@ -47,7 +47,6 @@ Installers are built and uploaded via Travis but if you want to construct your o
 # Configuration
 export ARCH=aarch64
 export DOCKERIMAGE=condaforge/linux-anvil-aarch64
-export QEMU_BINARY=qemu-aarch64-static
 
 bash build_miniforge.sh
 ```

build_miniforge.sh

@@ -4,8 +4,8 @@ set -e
 
 # Check parameters
 ARCH=${ARCH:-aarch64}
+DOCKER_ARCH=${DOCKER_ARCH:arm64v8}
 DOCKERIMAGE=${DOCKERIMAGE:-condaforge/linux-anvil-aarch64}
-QEMU_BINARY=${QEMU_BINARY:-qemu-aarch64-static}
 
 echo "============= Create build directory ============="
 mkdir -p build/
@@ -21,15 +21,9 @@ echo "============= Download QEMU static binaries ============="
 bash scripts/get_qemu.sh
 
 echo "============= Test the installer ============="
-for DOCKERFILE_PATH in $(find test_images/ -name "*.$ARCH")
+for TEST_IMAGE_NAME in "ubuntu:19.10" "ubuntu:16.04" "ubuntu:18.04" "centos:7" "debian:buster"
 do
-  TEST_IMAGE_SUFFIX=$(echo $DOCKERFILE_PATH  | cut -d'.' -f2-)
-  TEST_IMAGE_NAME="miniforge_test_image.$TEST_IMAGE_SUFFIX"
-
-  echo "============= Building $TEST_IMAGE_NAME ============="
-  docker build -t $TEST_IMAGE_NAME -f $DOCKERFILE_PATH .
-
   echo "============= Test installer on $TEST_IMAGE_NAME ============="
-  docker run --rm -ti -v $(pwd):/construct $TEST_IMAGE_NAME /construct/scripts/test.sh
+  docker run --rm -ti -v $(pwd):/construct -v $(pwd)/build/qemu/qemu-${ARCH}-static:/usr/bin/qemu-${ARCH}-static ${DOCKER_ARCH}/$TEST_IMAGE_NAME /construct/scripts/test.sh
 done
 

scripts/get_qemu.sh

@@ -7,20 +7,24 @@ QEMU_DIR="./build/qemu/"
 qemu_ppc64le_sha256=d018b96e20f7aefbc50e6ba93b6cabfd53490cdf1c88b02e7d66716fa09a7a17
 qemu_aarch64_sha256=a64b39b8ce16e2285cb130bcba7143e6ad2fe19935401f01c38325febe64104b
 qemu_arm_sha256=f4184c927f78d23d199056c5b0b6d75855e298410571d65582face3159117901
+qemu_x86_64_sha256=b9e444bf656c13a6db502f09e3135ef0c6045a117d5413662ba233d8b80f8fbd
 
 mkdir -p $QEMU_DIR/
 cd $QEMU_DIR/
 
 wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_STATIC_VERSION}/qemu-ppc64le-static
 wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_STATIC_VERSION}/qemu-aarch64-static
 wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_STATIC_VERSION}/qemu-arm-static
+wget https://github.com/multiarch/qemu-user-static/releases/download/${QEMU_STATIC_VERSION}/qemu-x86_64-static
 
 sha256sum qemu-ppc64le-static | grep -F "${qemu_ppc64le_sha256}"
 sha256sum qemu-aarch64-static | grep -F "${qemu_aarch64_sha256}"
 sha256sum qemu-arm-static | grep -F "${qemu_aarch64_sha256}"
+sha256sum qemu-x86_64-static | grep -F "${qemu_x86_64_sha256}"
 
 chmod +x qemu-ppc64le-static
 chmod +x qemu-aarch64-static
 chmod +x qemu-arm-static
+chmod +x qemu-x86_64-static
 
 cd $CURRENT_DIR