fix: env: can be an expression (#21)

Author: woodruffw

src/common/expr.rs

@@ -41,12 +41,11 @@ impl ExplicitExpr {
     /// `${{ body }}`. Leading and trailing whitespace within
     /// the expression body is removed.
     pub fn as_bare(&self) -> &str {
-        return self
-            .as_curly()
+        self.as_curly()
             .strip_prefix("${{")
             .and_then(|e| e.strip_suffix("}}"))
             .map(|e| e.trim())
-            .expect("invariant violated: ExplicitExpr must be an expression");
+            .expect("invariant violated: ExplicitExpr must be an expression")
     }
 }
 
@@ -113,7 +112,7 @@ mod tests {
     #[test]
     fn test_expr() {
         let expr = "\"  ${{ foo }} \\t \"";
-        let expr: ExplicitExpr = serde_yaml::from_str(&expr).unwrap();
+        let expr: ExplicitExpr = serde_yaml::from_str(expr).unwrap();
         assert_eq!(expr.as_bare(), "foo");
     }
 

src/workflow/job.rs

@@ -109,7 +109,7 @@ pub enum StepBody {
         working_directory: Option<String>,
         shell: Option<String>,
         #[serde(default)]
-        env: Env,
+        env: LoE<Env>,
     },
 }
 
@@ -239,7 +239,7 @@ matrix:
         let runson = "group: \nlabels: []";
 
         assert_eq!(
-            serde_yaml::from_str::<RunsOn>(&runson)
+            serde_yaml::from_str::<RunsOn>(runson)
                 .unwrap_err()
                 .to_string(),
             "runs-on must provide either `group` or one or more `labels`"

tests/sample-workflows/jazzband-tablib-docs-lint.yml

@@ -0,0 +1,39 @@
+# https://raw.githubusercontent.com/jazzband/tablib/dcab406c553fc8b3c2e0aef955e9e8adea0590d8/.github/workflows/docs-lint.yml
+name: Docs and lint
+
+on: [push, pull_request, workflow_dispatch]
+
+env:
+  FORCE_COLOR: 1
+  PIP_DISABLE_PIP_VERSION_CHECK: 1
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        env:
+          - TOXENV: docs
+          - TOXENV: lint
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.x"
+          cache: pip
+          cache-dependency-path: "pyproject.toml"
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          python -m pip install --upgrade tox
+
+      - name: Tox
+        run: tox
+        env: ${{ matrix.env }}

tests/test_workflow.rs

@@ -66,7 +66,7 @@ fn test_pip_audit_ci() {
         run,
         working_directory,
         shell,
-        env,
+        env: LoE::Literal(env),
     } = &test_job.steps[2].body
     else {
         panic!("expected run step");