Merge #683

683: fix env r=reitermarkus a=Emilgardis

Fixes a wrong assumption done in #670 where we went from

```toml
[target.aarch64-unknown-linux-gnu.env]
volumes = [
    "BUILD_DIR",
]
```

to

```toml
[target.aarch64-unknown-linux-gnu]
volumes = [
    "BUILD_DIR",
]
```

this fixes that, and makes sure that all markdown toml fences are checked in CI for correctness.

This pr also "un-opts" what was previously `CrossBuildConfig` to simplify a bit, see #670 (comment)

Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>

.github/workflows/ci.yml

@@ -74,7 +74,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          args: --locked
+          args: --locked --all-targets --workspace
         timeout-minutes: 5
 
   generate-matrix:

.gitignore

@@ -1 +1,5 @@
-target
+**/target/
+**/.idea/
+**/.vscode/*.*
+**/*.log
+/cargo-timing*.html

Cargo.toml

@@ -14,7 +14,6 @@ atty = "0.2"
 color-eyre = "0.6"
 eyre = "0.6"
 home = "0.5"
-lazy_static = "1"
 rustc_version = "0.4"
 toml = "0.5"
 which = { version = "4", default_features = false }
@@ -33,3 +32,8 @@ dunce = "1"
 
 [profile.release]
 lto = true
+
+[dev-dependencies]
+regex = "1"
+once_cell = "1"
+walkdir = "2"

README.md

@@ -226,15 +226,15 @@ non-standard targets (i.e. something not reported by rustc/rustup). However,
 you can use the `build.xargo` or `target.{{TARGET}}.xargo` field in
 `Cross.toml` to force the use of `xargo`:
 
-``` toml
+```toml
 # all the targets will use `xargo`
 [build]
 xargo = true
 ```
 
 Or,
 
-``` toml
+```toml
 # only this target will use `xargo`
 [target.aarch64-unknown-linux-gnu]
 xargo = true

docs/cross_toml.md

@@ -25,9 +25,17 @@ The `target` key allows you to specify parameters for specific compilation targe
 
 ```toml
 [target.aarch64-unknown-linux-gnu]
-volumes = ["VOL1_ARG", "VOL2_ARG"]
-passthrough = ["VAR1", "VAR2"]
 xargo = false
 image = "test-image"
 runner = "custom-runner"
 ```
+
+# `target.TARGET.env`
+The `target` key allows you to specify environment variables that should be used for a specific compilation target.
+This is similar to `build.env`, but allows you to be more specific per target.
+
+```toml
+[target.x86_64-unknown-linux-gnu.env]
+volumes = ["VOL1_ARG", "VOL2_ARG"]
+passthrough = ["IMPORTANT_ENV_VARIABLES"]
+```

src/config.rs

@@ -319,7 +319,7 @@ mod tests {
         use std::matches;
 
         fn toml(content: &str) -> Result<crate::CrossToml> {
-            Ok(CrossToml::from_str(content).wrap_err("couldn't parse toml")?)
+            Ok(CrossToml::parse(content).wrap_err("couldn't parse toml")?.0)
         }
 
         #[test]