From c190295c3423f269cd0c374d73df8c18b994ea51 Mon Sep 17 00:00:00 2001
From: Matt Hill <mattnine@protonmail.com>
Date: Fri, 30 Jan 2026 11:23:40 -0700
Subject: [PATCH] cleaner, also eliminate duplicate workflows

---
 .github/workflows/start-cli.yaml      |  4 ++++
 .github/workflows/start-registry.yaml |  6 +++++-
 .github/workflows/start-tunnel.yaml   |  6 +++++-
 .github/workflows/startos-iso.yaml    |  4 ++++
 .github/workflows/test.yaml           |  4 ++++
 Makefile                              | 10 +++++++---
 web/package.json                      |  8 ++++----
 7 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/start-cli.yaml b/.github/workflows/start-cli.yaml
index 1df4bc8c1..61b50389c 100644
--- a/.github/workflows/start-cli.yaml
+++ b/.github/workflows/start-cli.yaml
@@ -37,6 +37,10 @@ on:
       - master
       - next/*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
diff --git a/.github/workflows/start-registry.yaml b/.github/workflows/start-registry.yaml
index 74daa6b26..ea276277e 100644
--- a/.github/workflows/start-registry.yaml
+++ b/.github/workflows/start-registry.yaml
@@ -1,4 +1,4 @@
-name: Start-Registry
+name: start-registry
 
 on:
   workflow_call:
@@ -35,6 +35,10 @@ on:
       - master
       - next/*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
diff --git a/.github/workflows/start-tunnel.yaml b/.github/workflows/start-tunnel.yaml
index ab994f418..93ca2d396 100644
--- a/.github/workflows/start-tunnel.yaml
+++ b/.github/workflows/start-tunnel.yaml
@@ -1,4 +1,4 @@
-name: Start-Tunnel
+name: Sstart-tunnel
 
 on:
   workflow_call:
@@ -35,6 +35,10 @@ on:
       - master
       - next/*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
diff --git a/.github/workflows/startos-iso.yaml b/.github/workflows/startos-iso.yaml
index 1efc3f9c1..8702c641f 100644
--- a/.github/workflows/startos-iso.yaml
+++ b/.github/workflows/startos-iso.yaml
@@ -45,6 +45,10 @@ on:
       - master
       - next/*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: '${{ fromJson(format(''["{0}", ""]'', github.event.inputs.environment || ''dev''))[github.event.inputs.environment == ''NONE''] }}'
diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml
index 203213605..be71cd949 100644
--- a/.github/workflows/test.yaml
+++ b/.github/workflows/test.yaml
@@ -10,6 +10,10 @@ on:
       - master
       - next/*
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 env:
   NODEJS_VERSION: "24.11.0"
   ENVIRONMENT: dev-unstable
diff --git a/Makefile b/Makefile
index d7772e371..7d3e5dbf9 100644
--- a/Makefile
+++ b/Makefile
@@ -324,15 +324,19 @@ web/.angular/.updated: patch-db/client/dist/index.js sdk/baseDist/package.json w
 	mkdir -p web/.angular
 	touch web/.angular/.updated
 
-web/dist/raw/ui/index.html: $(WEB_UI_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
+web/.i18n-checked: $(WEB_SHARED_SRC) $(WEB_UI_SRC) $(WEB_SETUP_WIZARD_SRC) $(WEB_START_TUNNEL_SRC)
+	npm --prefix web run check:i18n
+	touch web/.i18n-checked
+
+web/dist/raw/ui/index.html: $(WEB_UI_SRC) $(WEB_SHARED_SRC) web/.angular/.updated web/.i18n-checked
 	npm --prefix web run build:ui
 	touch web/dist/raw/ui/index.html
 
-web/dist/raw/setup-wizard/index.html: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
+web/dist/raw/setup-wizard/index.html: $(WEB_SETUP_WIZARD_SRC) $(WEB_SHARED_SRC) web/.angular/.updated web/.i18n-checked
 	npm --prefix web run build:setup
 	touch web/dist/raw/setup-wizard/index.html
 
-web/dist/raw/start-tunnel/index.html: $(WEB_START_TUNNEL_SRC) $(WEB_SHARED_SRC) web/.angular/.updated
+web/dist/raw/start-tunnel/index.html: $(WEB_START_TUNNEL_SRC) $(WEB_SHARED_SRC) web/.angular/.updated web/.i18n-checked
 	npm --prefix web run build:tunnel
 	touch web/dist/raw/start-tunnel/index.html
 
diff --git a/web/package.json b/web/package.json
index e17493b51..aad02cbbe 100644
--- a/web/package.json
+++ b/web/package.json
@@ -14,10 +14,10 @@
     "check:tunnel": "tsc --project projects/start-tunnel/tsconfig.json --noEmit --skipLibCheck",
     "check:i18n": "node scripts/check-i18n.mjs",
     "build:deps": "rimraf .angular/cache && (cd ../sdk && make bundle) && (cd ../patch-db/client && npm ci && npm run build)",
-    "build:setup": "npm run check:i18n && ng run setup-wizard:build",
-    "build:ui": "npm run check:i18n && ng run ui:build",
-    "build:ui:dev": "npm run check:i18n && ng run ui:build:development",
-    "build:tunnel": "npm run check:i18n && ng run start-tunnel:build",
+    "build:setup": "ng run setup-wizard:build",
+    "build:ui": "ng run ui:build",
+    "build:ui:dev": "ng run ui:build:development",
+    "build:tunnel": "ng run start-tunnel:build",
     "build:all": "npm run build:deps && npm run build:setup && npm run build:ui",
     "build:shared": "ng build shared",
     "build:marketplace": "npm run build:shared && ng build marketplace",