Skip to content

Commit 121eb3f

Browse files
committed
Use image:tag naming style for image; let more env through
This changes the style of how we name the custom Docker image for `cross` testing, so it is not looked up on Docker Hub (it is not there, and the text before the `/` in the old name was not intended to have a meaning related to resolving the image in any registry). This also allows through the environment varibles that currently have special meaning to gitoxide or its test suite -- including `GIX_TEST_IGNORE_ARCHIVES` to test the fixture scripts in the container, if it is set for the `cross` process -- or that the test suite may reasonably use to detect CI in general or GitHub Actions in particular. (Most GitHub Actions environment variables continue not to be passed through, because some of them would hold paths that couldn't necessarily be resolved properly in the container, while the presence of others would wrongly create the appearance that all GitHub Actions environment variables would be usable.)
1 parent 2a155b6 commit 121eb3f

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed

Cross.toml

+15-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,16 @@
1+
[build.env]
2+
passthrough = [
3+
"CI",
4+
"GITHUB_ACTIONS",
5+
"GIX_CREDENTIALS_HELPER_STDERR",
6+
"GIX_EXTERNAL_COMMAND_STDERR",
7+
"GIX_OBJECT_CACHE_MEMORY",
8+
"GIX_PACK_CACHE_MEMORY",
9+
"GIX_TEST_CREATE_ARCHIVES_EVEN_ON_CI",
10+
"GIX_TEST_EXPECT_REDUCED_TRUST",
11+
"GIX_TEST_IGNORE_ARCHIVES",
12+
"GIX_VERSION",
13+
]
14+
115
[target.s390x-unknown-linux-gnu]
2-
image = "cross-rs-gitoxide/s390x-unknown-linux-gnu"
16+
image = "cross-rs-gitoxide:s390x-unknown-linux-gnu"

etc/run-cross-experiment.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -ex
33

44
# Build the customized `cross` container image.
5-
docker build -t cross-rs-gitoxide/s390x-unknown-linux-gnu \
5+
docker build -t cross-rs-gitoxide:s390x-unknown-linux-gnu \
66
- <etc/docker/Dockerfile.test-cross-s390x
77

88
# Clean files that could cause tests to wrongly pass or fail.

0 commit comments

Comments
 (0)