From 539126bcbc7cd75ad7d13beefab23d5da5918ab0 Mon Sep 17 00:00:00 2001
From: bloodearnest <simon.davy@thedatalab.org>
Date: Wed, 8 Nov 2023 10:46:22 +0000
Subject: [PATCH] Update links

Also, add additional documentation to justfile commands
---
 DEVELOPERS.md | 21 ++++++++++++++-------
 justfile      | 34 ++++++++++++++++------------------
 2 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/DEVELOPERS.md b/DEVELOPERS.md
index fd65fe6b..2facbd3c 100644
--- a/DEVELOPERS.md
+++ b/DEVELOPERS.md
@@ -27,11 +27,18 @@ based browser.
   - [Vite](#vite)
 - [Links to built artefacts](#links-to-built-artefacts)
 
-## System requirements
 
-### Windows
+## System requirements for building
 
-Python 3.10: https://www.python.org/downloads/windows/
+ - Python 3.10
+ - [just](https://github.com/casey/just)
+ - Node.js v20
+
+### Windows specific build requirements
+
+Windows is a bit trickier to get up and running.
+
+Python 3.10: https://www.python.org/downloads/windows/ (recommend not using Microsoft Store version)
 Node.js v20: https://github.com/Schniz/fnm
 git-bash: https://gitforwindows.org/
 just: `choco install just` (choco: https://chocolatey.org/)
@@ -47,6 +54,7 @@ You should reboot after installing all this, because Windows.
 
 Note: just commands will only work inside git-bash shell by default, as they assume bash
 
+
 ## Local development environment
 
 Run the Django devserver with:
@@ -180,7 +188,6 @@ Django is configured to use `assets/dist` as a directory to collect static files
 
 We use [nightly.link for GitHub](https://nightly.link/) as a redirect service to point users to the latest builds.
 
-The redirect URLs are stored in the [opensafely.org repo `static/_redirects` file](https://github.com/ebmdatalab/opensafely.org/blob/main/static/_redirects#L74).
-
-- [Windows link](https://www.opensafely.org/sacro/latest-windows-build)
-- [Linux link](https://www.opensafely.org/sacro/latest-linux-build)
+Windows: https://nightly.link/AI-SDC/SACRO-Viewer/workflows/main/main/SACRO-latest-windows-build.zip
+MacOS: https://nightly.link/AI-SDC/SACRO-Viewer/workflows/main/main/SACRO-latest-macos-build.zip
+Linux: https://nightly.link/AI-SDC/SACRO-Viewer/workflows/main/main/SACRO-latest-linux-build.zip
diff --git a/justfile b/justfile
index f804f321..4b9e4273 100644
--- a/justfile
+++ b/justfile
@@ -113,43 +113,37 @@ test *args: devenv test-outputs collectstatic
     $BIN/coverage report || $BIN/coverage html
 
 
-test-e2e: devenv test-outputs
+# run cypress tests suite in headless mode (needs running server)
+test-e2e: devenv test-outputs collectstatic
     npm run cypress:run
 
-
-test-cypress: devenv test-outputs
+# open cypress UI to run tests manually (needs running server)
+test-cypress: devenv test-outputs collectstatic
     npm run cypress:open
 
-
-black *args=".": devenv
-    $BIN/black --check {{ args }}
-
-ruff *args=".": devenv
-    $BIN/ruff check {{ args }}
-
-# run the various dev checks but does not change any files
-check: black ruff
+# run the various linter does not change any files
+check: devenv assets-install
+    $BIN/black --check
+    $BIN/ruff check
     npm run lint
 
 
-# fix formatting and import sort ordering
+# run various linters and fix
 fix: devenv assets-install
     $BIN/black .
     $BIN/ruff --fix .
     npm run lint:fix
 
 
-# Run the dev project
+# Run the dev python service locally
 run: devenv collectstatic test-outputs
     $BIN/python manage.py migrate
     $BIN/python manage.py runserver
 
+# Build python application
 build: collectstatic
     $BIN/pyoxidizer build --release
 
-eslint:
-    npm run lint
-
 # Install the Node.js dependencies
 assets-install:
     #!/usr/bin/env bash
@@ -185,10 +179,13 @@ assets-build: assets-install
     touch assets/dist/.written
 
 
+# build all js assets
 assets: assets-build
 
+# clean and rebuild all js assets
 assets-rebuild: assets-clean assets
 
+# run js tooling in dev mode
 assets-run: assets-install
   #!/usr/bin/env bash
 
@@ -202,12 +199,13 @@ assets-run: assets-install
 collectstatic: devenv assets
     ./scripts/collect-me-maybe.sh $BIN/python
 
-
+# fetch nursery test data
 test-data:
     #!/usr/bin/env bash
     if test -f data/dataset_26_nursery.arff; then exit 0; fi
     curl https://www.openml.org/data/download/26/dataset_26_nursery.arff -\o data/dataset_26_nursery.arff
 
+# build test outputs
 test-outputs: test-data devenv
     #!/usr/bin/env bash
     if test outputs/results.json -nt data/test-nursery.py; then exit 0; fi