adds headed CI for shell runner

.github/workflows/ci.yaml

@@ -19,7 +19,7 @@ env:
   NODE_VERSION: 23.3.0
 
   # Latest Rust version: https://www.rust-lang.org/
-  RUST_VERSION: 1.82.0
+  RUST_VERSION: 1.83.0
 
 jobs:
   nodejs:

ci/Cargo.toml

@@ -6,6 +6,6 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = "4.5.21"
+clap = "4.5.23"
 serde_json = "1.0.133"
 sha2 = "0.10.8"

ci/src/lib.rs

@@ -42,6 +42,10 @@ pub struct Cli {
     #[arg(short, long)]
     fail_fast: bool,
 
+    /// Use headed (GUI) browsers for e2e tests
+    #[arg(short = 'e', long)]
+    headed: bool,
+
     /// Runner for scripts [docker, shell]
     #[arg(short, long, default_value = "docker")]
     runner: String,
@@ -67,6 +71,7 @@ pub fn cmd(args: Cli) {
         cwd: std::env::var("HOST_WORKDIR").unwrap_or(
             String::from(std::env::current_dir().unwrap().to_str().unwrap())
         ),
+        headed: args.headed,
         verbose: args.verbose,
     });
 
@@ -140,6 +145,7 @@ pub type Error = Box<dyn std::error::Error>;
 pub struct Context {
     pub id: String,
     pub cwd: String,
+    pub headed: bool,
     pub verbose: bool,
 }
 

ci/src/stages/dev_e2e.rs

@@ -13,16 +13,16 @@ impl Stage for DevE2E {
     }
 
     // run e2e tests against dev servers
-    fn run(&self, _context: &Context, runner: &dyn Runner) -> Result<(), Error> {
+    fn run(&self, context: &Context, runner: &dyn Runner) -> Result<(), Error> {
         let expiration = 3000;
 
-        node_dev_e2e(expiration, runner)?;
+        node_dev_e2e(expiration, runner, context)?;
 
-        rust_dev_e2e(expiration, runner)
+        rust_dev_e2e(expiration, runner, context)
     }
 }
 
-fn node_dev_e2e(expiration: u32, runner: &dyn Runner) -> Result<(), Error> {
+fn node_dev_e2e(expiration: u32, runner: &dyn Runner, context: &Context) -> Result<(), Error> {
     let server = runner.run_background(
         ExecutionContext::Build,
         vec![],
@@ -38,11 +38,16 @@ fn node_dev_e2e(expiration: u32, runner: &dyn Runner) -> Result<(), Error> {
         ExecutionContext::E2E,
         vec![],
         true,
-        &cypress_script(&server.addr(), "node-dev", &BROWSERS),
+        &cypress_script(
+            &server.addr(),
+            "node-dev",
+            &BROWSERS,
+            context.headed,
+        ),
     )
 }
 
-fn rust_dev_e2e(expiration: u32, runner: &dyn Runner) -> Result<(), Error> {
+fn rust_dev_e2e(expiration: u32, runner: &dyn Runner, context: &Context) -> Result<(), Error> {
     runner.run(
         ExecutionContext::Build,
         vec![&format!(
@@ -86,22 +91,29 @@ fn rust_dev_e2e(expiration: u32, runner: &dyn Runner) -> Result<(), Error> {
                 "CYPRESS_REQUIRE_CLEAN_PERSISTENCE=true",
             ],
             true,
-            &cypress_script(&server.addr(), "rust-dev", &[browser]),
+            &cypress_script(
+                &server.addr(),
+                "rust-dev",
+                &[browser],
+                context.headed,
+            ),
         )?;
     }
 
     Ok(())
 }
 
-fn cypress_script(server_addr: &str, stage_name: &str, browsers: &[&str]) -> String {
+fn cypress_script(server_addr: &str, stage_name: &str, browsers: &[&str], headed: bool) -> String {
+    let headed = if headed { "--headed" } else { "--headless" };
     format!(r"
         set -xe
         cd ui
         trap 'mv *-e2e.xml ../test_results/' EXIT
         for b in {0}; do
-            CYPRESS_MOCHA_FILE={2}-$b-e2e.xml npx cypress run \
+            CYPRESS_MOCHA_FILE={1}-$b-e2e.xml npx cypress run \
+                {2} \
                 --browser $b \
-                --config baseUrl=http://{1}:8080
+                --config baseUrl=http://{3}:8080
         done
-    ", browsers.join(" "), server_addr, stage_name)
+    ", browsers.join(" "), stage_name, headed, server_addr)
 }

images/build.Dockerfile

@@ -4,10 +4,10 @@ ARG NODE_VERSION="23.3.0"
 FROM node:${NODE_VERSION}-alpine
 
 # Latest NPM version: https://www.npmjs.com/package/npm
-ARG NPM_VERSION="10.9.1"
+ARG NPM_VERSION="10.9.2"
 
 # Latest Rust version: https://www.rust-lang.org/
-ARG RUST_VERSION="1.82.0"
+ARG RUST_VERSION="1.83.0"
 
 # Latest nextest version: https://github.com/nextest-rs/nextest/releases
 ARG NEXTEST_VERSION="^0.9"

images/e2e.Dockerfile

@@ -2,21 +2,21 @@
 ARG NODE_VERSION="23.3.0"
 
 # Latest Chrome version: https://www.ubuntuupdates.org/package/google_chrome/stable/main/base/google-chrome-stable
-ARG CHROME_VERSION="131.0.6778.85-1"
+ARG CHROME_VERSION="131.0.6778.108-1"
 
 # Latest Firefox version: https://www.mozilla.org/en-US/firefox/releases/
-ARG FIREFOX_VERSION="132.0.2"
+ARG FIREFOX_VERSION="133.0"
 
 # Disable other browsers
 ARG EDGE_VERSION=
 ARG YARN_VERSION=
 ARG CYPRESS_VERSION=
 
 # Latest cypress factory version: https://hub.docker.com/r/cypress/factory/tags
-FROM cypress/factory:5.1.0
+FROM cypress/factory:5.1.1
 
 # Latest NPM version: https://www.npmjs.com/package/npm
-ARG NPM_VERSION="10.9.1"
+ARG NPM_VERSION="10.9.2"
 
 USER root
 

tools/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-clap = { version = "4.5.21", features = ["derive"] }
+clap = { version = "4.5.23", features = ["derive"] }
 regex = "1.11.1"
 reqwest = "0.12.9"
 serde_yaml = "0.9.34"
-tokio = { version = "1.41.1", features = ["full"] }
+tokio = { version = "1.42.0", features = ["full"] }