do a stretch build for aarch64/gnu

sonos · Jan 11, 2024 · 78b730d · 78b730d
1 parent 65153b0
commit 78b730d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/.github/workflows/cross-platform.yml b/.github/workflows/cross-platform.yml
@@ -16,6 +16,7 @@ jobs:
         platform:
           - raspbian
           - aarch64-unknown-linux-gnu
+          - aarch64-unknown-linux-gnu-stretch
           - armv6vfp-unknown-linux-gnueabihf
           - armv7-unknown-linux-gnueabihf
           - armv7-unknown-linux-gnueabihf-stretch

diff --git a/.travis/cross.sh b/.travis/cross.sh
@@ -103,11 +103,12 @@ case "$PLATFORM" in
         cargo build --target aarch64-apple-darwin
         ;;
 
-    "armv7-unknown-linux-gnueabihf-stretch")
+    "aarch64-unknown-linux-gnu-stretch" | "armv7-unknown-linux-gnueabihf-stretch" )
+        INNER_PLATFORM=${PLATFORM%-stretch}
         (cd .travis/docker-debian-stretch; docker build --tag debian-stretch .)
-        docker run -v `pwd`:/tract -w /tract -e PLATFORM=armv7-unknown-linux-gnueabihf debian-stretch ./.travis/cross.sh 
+        docker run -v `pwd`:/tract -w /tract -e PLATFORM=$INNER_PLATFORM debian-stretch ./.travis/cross.sh 
         sudo chown -R `whoami` .
-        export RUSTC_TRIPLE=armv7-unknown-linux-gnueabihf
+        export RUSTC_TRIPLE=$INNER_PLATFORM
         ;;
 
     "aarch64-unknown-linux-gnu" | "armv6vfp-unknown-linux-gnueabihf" | "armv7-unknown-linux-gnueabihf" | \

diff --git a/.travis/docker-debian-stretch/Dockerfile b/.travis/docker-debian-stretch/Dockerfile
@@ -1,7 +1,2 @@
 FROM debian:stretch
-
 COPY sources.list /etc/apt/sources.list
-RUN apt-get -y update ; apt-get -y upgrade ; apt-get install -y curl wget build-essential # gcc-arm-linux-gnueabihf binutils-arm-linux-gnueabihf
-# RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-# ENV PATH $PATH:/root/.cargo/bin
-# RUN rustup target install armv7-unknown-linux-gnueabihf