fix: makefile tests for ci

Author: joseluisq

.drone.yml

@@ -20,7 +20,7 @@ steps:
   image: joseluisq/rust-linux-darwin-builder:latest
   pull: if-not-exists
   commands:
-    - ./docker/image_test.sh
+    - make test
 
 trigger:
   event:

.travis.yml

@@ -7,9 +7,7 @@ os:
   - linux
 
 script:
-- bash ./docker/image_test.sh
+- make test
 
 notifications:
-  email:
-    on_success: never
-    on_failure: always
+  email: false

Makefile

@@ -1,9 +1,22 @@
 build:
 	docker build \
-		-t joseluisq/rust-linux-darwin-builder:1 \
+		-t joseluisq/rust-linux-darwin-builder:latest \
 		-f docker/Dockerfile .
 .PHONY: build
 
+test:
+	@sudo chown -R rust:rust ./
+	@echo "Testing application..."
+	@rustc -vV
+	@echo "Compiling application(linux-musl x86_64)..."
+	@cargo build --manifest-path=examples/hello-world/Cargo.toml --release --target x86_64-unknown-linux-musl
+	@du -sh examples/hello-world/target/x86_64-unknown-linux-musl/release/helloworld
+	@echo
+	@echo "Compiling application(apple-darwin x86_64)..."
+	@cargo build --manifest-path=examples/hello-world/Cargo.toml --release --target x86_64-apple-darwin
+	@du -sh examples/hello-world/target/x86_64-apple-darwin/release/helloworld
+.ONESHELL: test
+
 release:
 	# 2. Update docker files to latest tag
 	./docker/version.sh $(TAG)

docker/Dockerfile

@@ -171,8 +171,7 @@ RUN set -eux \
     && curl -L -o ./tarballs/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
     https://s3.amazonaws.com/andrew-osx-sdks/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
     && env UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh \
-    && ./cleanup.sh \
-    && rm -rf ./taballs \
+    && rm -rf *~ taballs *.tar.xz \
     && rm -rf /tmp/*
 
 ENV PATH $PATH:/home/rust/osxcross/target/bin

docker/image_test.sh

@@ -4,7 +4,7 @@
 set -euo pipefail
 
 # Make sure we can build our main container.
-docker build -t joseluisq/rust-linux-darwin-builder .
+docker build -t joseluisq/rust-linux-darwin-builder -f docker/Dockerfile .
 
 # Make sure we can build our example derived container.
 docker build -t rust-musl-zlib examples/adding-a-library

docker/tmpl.Dockerfile

@@ -171,8 +171,7 @@ RUN set -eux \
     && curl -L -o ./tarballs/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
     https://s3.amazonaws.com/andrew-osx-sdks/MacOSX${OSXCROSS_SDK_VERSION}.sdk.tar.xz \
     && env UNATTENDED=yes OSX_VERSION_MIN=10.7 ./build.sh \
-    && ./cleanup.sh \
-    && rm -rf ./taballs \
+    && rm -rf *~ taballs *.tar.xz \
     && rm -rf /tmp/*
 
 ENV PATH $PATH:/home/rust/osxcross/target/bin