Skip to content
This repository was archived by the owner on May 20, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/workflow/job.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ pub struct NormalJob {
#[serde(default, deserialize_with = "crate::common::scalar_or_vector")]
pub needs: Vec<String>,
pub r#if: Option<If>,
pub runs_on: RunsOn,
pub runs_on: LoE<RunsOn>,
pub environment: Option<DeploymentEnvironment>,
pub concurrency: Option<Concurrency>,
#[serde(default)]
Expand Down
12 changes: 12 additions & 0 deletions tests/sample-workflows/runs-on-expr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name: runs-on-expr
on: [push]
jobs:
check-bats-version:
runs-on: ${{ matrix.runner }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "14"
- run: npm install -g bats
- run: bats -v
26 changes: 21 additions & 5 deletions tests/test_workflow.rs
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
use std::{env, path::Path};

use github_actions_models::workflow::{
event::OptionalBody,
job::{RunsOn, StepBody},
Job, Trigger, Workflow,
use github_actions_models::{
common::expr::{ExplicitExpr, LoE},
workflow::{
event::OptionalBody,
job::{RunsOn, StepBody},
Job, Trigger, Workflow,
},
};

fn load_workflow(name: &str) -> Workflow {
Expand Down Expand Up @@ -41,7 +44,7 @@ fn test_pip_audit_ci() {
assert_eq!(test_job.name, None);
assert_eq!(
test_job.runs_on,
RunsOn::Target(vec!["ubuntu-latest".to_string()])
LoE::Literal(RunsOn::Target(vec!["ubuntu-latest".to_string()]))
);
assert_eq!(test_job.steps.len(), 3);

Expand Down Expand Up @@ -73,3 +76,16 @@ fn test_pip_audit_ci() {
assert!(shell.is_none());
assert!(env.is_empty());
}

#[test]
fn test_runs_on_expr() {
let workflow = load_workflow("runs-on-expr.yml");

let job = workflow.jobs.get("check-bats-version").unwrap();
let Job::NormalJob(job) = job else { panic!() };

assert_eq!(
job.runs_on,
LoE::Expr(ExplicitExpr::from_curly("${{ matrix.runner }}").unwrap())
);
}