Mirrors/wrkflw
1
0
Fork 0
mirror of https://github.com/bahdotsh/wrkflw.git synced 2025-12-16 11:47:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52 from bahdotsh/fix/ubuntu-container-image-selection

Browse Source 
fix: ubuntu container image selection
This commit is contained in:
Gokul
2025-08-21 22:37:22 +05:30
committed by GitHub
parent 4e66f65de7 f1ca411281
commit 1d56d86ba5
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
crates/executor/src/engine.rs
View File

@@ -570,7 +570,7 @@ async fn prepare_action(
} else { } else {
// It's a JavaScript or composite action // It's a JavaScript or composite action
// For simplicity, we'll use node to run it (this would need more work for full support) // For simplicity, we'll use node to run it (this would need more work for full support)
return Ok("node:16-buster-slim".to_string()); return Ok("node:20-slim".to_string());
} }
} }
@@ -628,7 +628,7 @@ fn determine_action_image(repository: &str) -> String {
{ {
"catthehacker/ubuntu:act-latest".to_string() // Use act runner image for core actions "catthehacker/ubuntu:act-latest".to_string() // Use act runner image for core actions
} else { } else {
"node:16-buster-slim".to_string() // Default for other actions "node:20-slim".to_string() // Default for other actions
} }
} }
} }
@@ -1224,13 +1224,15 @@ async fn execute_step(ctx: StepExecutionContext<'_>) -> Result<StepResult, Execu
let mut owned_strings: Vec<String> = Vec::new(); // Keep strings alive until after we use cmd let mut owned_strings: Vec<String> = Vec::new(); // Keep strings alive until after we use cmd
// Special handling for Rust actions // Special handling for Rust actions
if uses.starts_with("actions-rs/") { if uses.starts_with("actions-rs/") || uses.starts_with("dtolnay/rust-toolchain") {
wrkflw_logging::info( wrkflw_logging::info(
"🔄 Detected Rust action - using system Rust installation", "🔄 Detected Rust action - using system Rust installation",
); );
// For toolchain action, verify Rust is installed // For toolchain action, verify Rust is installed
if uses.starts_with("actions-rs/toolchain@") { if uses.starts_with("actions-rs/toolchain@")
|| uses.starts_with("dtolnay/rust-toolchain@")
{
let rustc_version = Command::new("rustc") let rustc_version = Command::new("rustc")
.arg("--version") .arg("--version")
.output() .output()
@@ -1556,7 +1558,7 @@ async fn execute_step(ctx: StepExecutionContext<'_>) -> Result<StepResult, Execu
let output = ctx let output = ctx
.runtime .runtime
.run_container( .run_container(
ctx.runner_image, &image,
&cmd.to_vec(), &cmd.to_vec(),
&env_vars, &env_vars,
container_workspace, container_workspace,
@@ -1905,11 +1907,11 @@ fn copy_directory_contents_with_gitignore(
fn get_runner_image(runs_on: &str) -> String { fn get_runner_image(runs_on: &str) -> String {
// Map GitHub runners to Docker images // Map GitHub runners to Docker images
match runs_on.trim() { match runs_on.trim() {
// ubuntu runners - micro images (minimal size) // ubuntu runners - using Ubuntu base images for better compatibility
"ubuntu-latest" => "node:16-buster-slim", "ubuntu-latest" => "ubuntu:latest",
"ubuntu-22.04" => "node:16-bullseye-slim", "ubuntu-22.04" => "ubuntu:22.04",
"ubuntu-20.04" => "node:16-buster-slim", "ubuntu-20.04" => "ubuntu:20.04",
"ubuntu-18.04" => "node:16-buster-slim", "ubuntu-18.04" => "ubuntu:18.04",
// ubuntu runners - medium images (with more tools) // ubuntu runners - medium images (with more tools)
"ubuntu-latest-medium" => "catthehacker/ubuntu:act-latest", "ubuntu-latest-medium" => "catthehacker/ubuntu:act-latest",

9
crates/runtime/src/emulation.rs
View File

@@ -643,6 +643,15 @@ pub async fn handle_special_action(action: &str) -> Result<(), ContainerError> {
wrkflw_logging::info(&format!("🔄 Detected Rust formatter action: {}", action)); wrkflw_logging::info(&format!("🔄 Detected Rust formatter action: {}", action));
check_command_available("rustfmt", "rustfmt", "rustup component add rustfmt"); check_command_available("rustfmt", "rustfmt", "rustup component add rustfmt");
} else if action.starts_with("dtolnay/rust-toolchain@") {
// For dtolnay/rust-toolchain action, check for Rust installation
wrkflw_logging::info(&format!(
"🔄 Detected dtolnay Rust toolchain action: {}",
action
));
check_command_available("rustc", "Rust", "https://rustup.rs/");
check_command_available("cargo", "Cargo", "https://rustup.rs/");
} else if action.starts_with("actions/setup-node@") { } else if action.starts_with("actions/setup-node@") {
// Node.js setup action // Node.js setup action
wrkflw_logging::info(&format!("🔄 Detected Node.js setup action: {}", action)); wrkflw_logging::info(&format!("🔄 Detected Node.js setup action: {}", action));