ci: Update docker images for arm (#865)
See https://github.com/cross-rs/cross/wiki/Configuration#builddockerfile for context regarding the $CROSS_BASE_IMAGE environment variable. Here, it resolves to ghcr.io/cross-rs/armv7-unknown-linux-gnueabihf:{{cross_version}} Relies on docker caching instead of pre-building the image. Cross made the change to the GHCR on https://github.com/cross-rs/cross/pull/609 Add newline at EOF for some files.
This commit is contained in:
parent
ac6cbb2ba5
commit
437d47f762
3 changed files with 5 additions and 7 deletions
3
.github/workflows/cpal.yml
vendored
3
.github/workflows/cpal.yml
vendored
|
|
@ -85,9 +85,6 @@ jobs:
|
||||||
with:
|
with:
|
||||||
target: armv7-unknown-linux-gnueabihf
|
target: armv7-unknown-linux-gnueabihf
|
||||||
|
|
||||||
- name: Build image
|
|
||||||
run: docker build -t cross/cpal_armv7:v1 ./
|
|
||||||
|
|
||||||
- name: Install cross
|
- name: Install cross
|
||||||
run: cargo install cross
|
run: cargo install cross
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
[target.armv7-unknown-linux-gnueabihf]
|
[target.armv7-unknown-linux-gnueabihf]
|
||||||
image = "cross/cpal_armv7:v1"
|
dockerfile = "Dockerfile"
|
||||||
|
|
||||||
[target.armv7-unknown-linux-gnueabihf.env]
|
[target.armv7-unknown-linux-gnueabihf.env]
|
||||||
passthrough = [
|
passthrough = [
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
FROM rustembedded/cross:armv7-unknown-linux-gnueabihf
|
ARG CROSS_BASE_IMAGE
|
||||||
|
FROM $CROSS_BASE_IMAGE
|
||||||
|
|
||||||
ENV PKG_CONFIG_ALLOW_CROSS 1
|
ENV PKG_CONFIG_ALLOW_CROSS 1
|
||||||
ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/pkgconfig/
|
ENV PKG_CONFIG_PATH /usr/lib/arm-linux-gnueabihf/pkgconfig/
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue