Tup refactor - wrapup

ci/build/dev.sh: 
ci/test/python-recorder-smoke.sh: 
ci/test/ui-tests.sh: 
justfile: 

Signed-off-by: Tzanko Matev <[email protected]>

Author: tzanko-matev

ci/build/dev.sh

@@ -31,13 +31,3 @@ TUP_OUTPUT_SCRIPT=tup-generated-build-once.sh
 tup generate --config build-debug/tup.config "$TUP_OUTPUT_SCRIPT"
 ./"$TUP_OUTPUT_SCRIPT"
 rm "$TUP_OUTPUT_SCRIPT"
-
-# Running the generated script populates the staging tree; clean it so that
-# subsequent `tup` invocations (locally or in CI) can start from a fresh slate.
-git clean -fx .
-
-popd
-
-pushd src/build-debug
-git clean -fx .
-popd

ci/test/python-recorder-smoke.sh

@@ -11,7 +11,7 @@ echo '##########################################################################
 
 nix develop .#devShells.x86_64-linux.default --command ./ci/build/dev.sh
 
-CT_BIN="${ROOT_DIR}/src/bin/ct"
+CT_BIN="${ROOT_DIR}/src/build/bin/ct"
 if [[ ! -x "${CT_BIN}" ]]; then
   echo "error: ${CT_BIN} not found after build"
   exit 1

ci/test/ui-tests.sh

@@ -6,9 +6,7 @@ echo '##########################################################################
 echo 'Running ui e2e playwright tests'
 echo '###############################################################################'
 
-# TODO: maybe pass the result from the build stage as artifact to this job?
-# TODO: tup generate seems problematic with variants: we need to fix/change the resulting dirs to work correctly
-# ./ci/build/dev.sh
+./ci/build/dev.sh
 
 # trying to make it work with the nix build, instead of the tup build:
 
@@ -25,10 +23,20 @@ echo '##########################################################################
 
 # ./ci/build/nix.sh
 
-# CODETRACER_E2E_CT_PATH="$(pwd)/result/bin/ct"
-# export CODETRACER_E2E_CT_PATH
+CODETRACER_E2E_CT_PATH="$(pwd)/src/build/bin/ct"
+LINKS_PATH_DIR="$(pwd)/src/build"
+NIX_CODETRACER_EXE_DIR="$(pwd)/src/build"
+CODETRACER_LINKS_PATH="$(pwd)/src/build"
 
-# pushd ui-tests
-# nix develop --command ./ci.sh
+export CODETRACER_E2E_CT_PATH
+export LINKS_PATH_DIR
+export NIX_CODETRACER_EXE_DIR
+export CODETRACER_LINKS_PATH
 
-# popd
+pushd ui-tests
+nix develop --command ./ci.sh
+
+popd
+
+git clean -fx ./src/build
+git clean -fx ./src/build-debug

justfile

@@ -14,10 +14,10 @@ build:
   # build-debug/codetracer user-setup
 
   # Start building continuously
-  cd src/build
+  cd src
   tup build-debug
   tup monitor -a
-  cd ../..
+  cd ..
 
   # start webpack
   node_modules/.bin/webpack --watch --progress & # building frontend_bundle.js
@@ -32,20 +32,20 @@ build-once:
   # We have to make the dist directory here, because it's missing on a fresh check out
   # It will be created by the webpack command below, but we have an a chicken and egg
   # problem because the Tupfiles refer to it.
-  mkdir public/dist
+  mkdir -p src/public/dist
 
-  cd src/build
+  cd src
   tup build-debug
-  cd ../..
+  cd ..
 
   # Build frontend_bundle.js in the dist folder
   node_modules/.bin/webpack --progress
 
   # We need to execute another tup run because webpack may have created some new files
   # that tup will discover
-  cd src/build
+  cd src
   tup build-debug
-  cd ../..
+  cd ..
 
 build-docs:
   #!/usr/bin/env bash

tup-build-staging-status.md

@@ -5,10 +5,8 @@
 - Standardized on per-file `SRC_DIR` handling for relocated Tupfiles, added `!cp_preserve` plus `src/build/.gitignore`, and refreshed `.agents/codebase-insights.txt`; no further Tupfile edits are planned.
 - Validated the build: both `tup` and `tup generate` succeed, `just build` / `just build-once` work end-to-end, and their outputs land under `src/build/` or `src/build-debug/build/` as intended.
 - Aligned developer tooling (Just recipes, CI helpers, Nix shells, non-Nix env scripts) and documentation—including contributor guides, mdBook outputs, and WebDriver specs—with the `src/build/` staging root and the new `build-debug/build` artifact paths, and documented the required clean-up after running generated scripts.
-
-## In Progress
-- Monitor developer tooling and CI jobs for regressions now that their scripts target `src/build/` and `src/build-debug/build/**`; collect feedback from early adopters before marking ADR 0006 as accepted.
+- Confirmed the updated workflows by exercising the key entry points (`tup build`, `tup build-debug`, `tup generate` + generated script, `just build`, `just build-once`) after the clean-up procedure; no regressions observed.
 
 ## Next
-- Verify CI and developer tooling run successfully with the updated paths and documented clean-up, then mark ADR 0006 as accepted.
-- Capture any follow-up automation needed to enforce the post-`tup.sh` cleaning workflow (e.g., pre-commit hooks or CI guardrails) based on user feedback.
+- Mark ADR 0006 as **Accepted**, close out this implementation plan, and communicate the finalized workflow (including the `tup generate` clean-up) to the wider team.
+- Monitor for feedback over the next sprint and decide whether additional automation is needed to enforce the post-`tup.sh` cleaning steps.