Try #878: --target cross

Author: bors[bot]

.github/workflows/ci.yml

@@ -204,6 +204,7 @@ jobs:
             - { target: thumbv7em-none-eabi,              os: ubuntu-latest,                    std: 1 }
             - { target: thumbv7em-none-eabihf,            os: ubuntu-latest,                    std: 1 }
             - { target: thumbv7m-none-eabi,               os: ubuntu-latest,                    std: 1 }
+            - { target: cross,                            os: ubuntu-latest }
 
   build:
     name: target (${{ matrix.pretty }},${{ matrix.os }})
@@ -261,7 +262,7 @@ jobs:
           LATEST: ${{ needs.check.outputs.is-latest || 'false' }}
         shell: bash
       - name: Set Docker image for test
-        if: steps.prepare-meta.outputs.has-image
+        if: steps.prepare-meta.outputs.has-image && ${{ matrix.target != 'cross' }}
         run: |
           TARGET_VAR="cross_target_${TARGET//-/_}_image"
           echo "${TARGET_VAR^^}=${IMAGE}" | tee -a "${GITHUB_ENV}"
@@ -270,7 +271,7 @@ jobs:
           IMAGE: ${{ steps.build-docker-image.outputs.image }}
         shell: bash
       - name: Test Image
-        if: steps.prepare-meta.outputs.has-image && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/trying')
+        if: (steps.prepare-meta.outputs.has-image && (github.ref == 'refs/heads/staging' || github.ref == 'refs/heads/trying')) && ${{ matrix.target != 'cross' }}
         run: ./ci/test.sh
         env:
           TARGET: ${{ matrix.target }}

CHANGELOG.md

@@ -7,6 +7,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased] - ReleaseDate
 
+### Added
+
+- #878 - added a dockerfile containing cross.
+
 ### Changed
 
 - #869 - ensure cargo configuration environment variable flags are passed to the docker container.

docker/Dockerfile.cross

@@ -0,0 +1,11 @@
+FROM docker:20.10-dind
+
+RUN apk add curl bash libgcc gcc musl-dev git
+
+RUN curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+# need to ensure cargo is in the path when we run this command,
+# since we won't be sourcing the profile.
+RUN PATH="$HOME/.cargo/bin:$PATH" cargo install cross --git https://github.com/cross-rs/cross --locked
+
+COPY cross-entry.sh /
+ENTRYPOINT ["/cross-entry.sh"]

docker/cross-entry.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+# shellcheck disable=SC1090
+. ~/.cargo/env
+export CROSS_CONTAINER_IN_CONTAINER=1
+
+exec "${@}"

docker/cross.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+main() {
+    apk add gcc curl musl-dev
+
+    curl --proto "=https" --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
+    PATH="$HOME/.cargo/bin:$PATH" cargo install cross --git https://github.com/cross-rs/cross --locked
+
+    apk del gcc curl musl-dev
+
+    rm -rf "${0}"
+}
+
+main "${@}"