Merge remote-tracking branch 'upstream/main'

hash-noob · hash-noob · commit 95b23c11ea16 · 2025-07-25T20:30:50.000+05:30
diff --git a/.github/workflows/build-all-sites.yml b/.github/workflows/build-all-sites.yml
@@ -0,0 +1,24 @@
+name: Build all sites
+
+on:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build_all_sites:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup Go
+        uses: actions/setup-go@v4
+        with:
+          go-version: 1.24.5
+      - name: Setup Hugo
+        uses: peaceiris/actions-hugo@75d2e84710de30f6ff7268e08f310b60ef14033f
+        with:
+          hugo-version: '0.136.3'
+          extended: true
+      - name: Build all sites
+        run: ./tooling/build_all_sites.sh
+        env:
+          HUGO_CURRICULUM_GITHUB_BEARER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/check-consistency.yml b/.github/workflows/check-consistency.yml
@@ -12,7 +12,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.24.5
       - name: Build tooling
         run: (cd tooling/go && go build ./cmd/local-overrides-enforcer && go build ./cmd/sprint-consistency && go build ./cmd/site-consistency)
       - name: Check override consistency
diff --git a/.github/workflows/test-tooling.yml b/.github/workflows/test-tooling.yml
@@ -12,6 +12,6 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v4
         with:
-          go-version: 1.21
+          go-version: 1.24.5
       - name: Run tooling tests
         run: cd tooling/go && go test ./...
diff --git a/common-content/en/blocks/morning-break/index.md b/common-content/en/blocks/morning-break/index.md
@@ -10,4 +10,4 @@ hide_from_overview=true
 
 +++
 
-A quick break of fifteen minutes so we can all concentrate on the next piece of work.
+A quick break so we can all concentrate on the next piece of work.
diff --git a/common-content/go.mod b/common-content/go.mod
@@ -1,3 +1,3 @@
 module github.com/CodeYourFuture/curriculum/common-content
 
-go 1.21.3
+go 1.24.5
diff --git a/common-docs/go.mod b/common-docs/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/common-docs
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 // indirect
diff --git a/common-theme/go.mod b/common-theme/go.mod
@@ -1,3 +1,3 @@
 module github.com/CodeYourFuture/curriculum/common-theme
 
-go 1.21.3
+go 1.24.5
diff --git a/common-theme/package.json b/common-theme/package.json
@@ -6,6 +6,7 @@
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "start:dev": "dotenv -- hugo server -p 3000 -D",
+    "build:dev": "hugo mod vendor && dotenv -e ../.env  -- hugo --environment development",
     "build:audit": "HUGO_MINIFY_TDEWOLFF_HTML_KEEPCOMMENTS=true HUGO_ENABLEMISSINGTRANSLATIONPLACEHOLDERS=true hugo mod vendor && dotenv -e ../.env  -- hugo --environment production && grep -inorE '<\\!-- raw HTML omitted -->|ZgotmplZ|\\[i18n\\]|\\(<nil>\\)|(&lt;nil&gt;)|hahahugo' public/"
   },
   "repository": {
diff --git a/org-cyf-guides/go.mod b/org-cyf-guides/go.mod
@@ -1,10 +1,10 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-guides
 
-go 1.22.6
+go 1.24.5
 
 require (
-	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20240818070728-e8702788f7cb // indirect
-	github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20240818070728-e8702788f7cb // indirect
+	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
+	github.com/CodeYourFuture/curriculum/common-theme v0.0.0-20241008095008-281a5517463f // indirect
 	github.com/CodeYourFuture/curriculum/org-cyf-theme v0.0.0-20240818070728-e8702788f7cb // indirect
 )
 
diff --git a/org-cyf-how-this-works/go.mod b/org-cyf-how-this-works/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-how-this-works
 
-go 1.22.6
+go 1.24.5
 
 toolchain go1.22.8
 
diff --git a/org-cyf-itd/content/blocks/how-itd-works/what-is-itd/index.md b/org-cyf-itd/content/blocks/how-itd-works/what-is-itd/index.md
@@ -7,7 +7,7 @@ time=5
 
 ### What is ITD
 
-When people [sign up to study](https://codeyourfuture.io/itc/) on our website, they are invited to begin our Intro To Digital (ITD) Course. This course opens for one month, then closes for one month, then reopens. It runs six times a year.
+When people [sign up to study](https://codeyourfuture.io/itc/) on our website, they are invited to begin our Intro To Digital (ITD) Course. This course lasts one month, and runs 5 times a year.
 
 Learners complete the course on our [Guided Learning platform](https://course1.codeyourfuture.io/) by completing a sequence of steps. Each step is explained clearly in B1 English. The text is reproduced on this site in the [Steps](./steps) section.
 
diff --git a/org-cyf-itd/go.mod b/org-cyf-itd/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-itd
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/org-cyf-itp/content/data-groups/sprints/1/day-plan/index.md b/org-cyf-itp/content/data-groups/sprints/1/day-plan/index.md
@@ -12,13 +12,17 @@ name="Morning orientation"
 src="blocks/morning-orientation"
 time=15
 [[blocks]]
-name="Workshop"
-src="blocks/workshop"
-time="140"
-[[blocks.nested.blocks]]
-    name="Giving Feedback [PD] (60 Mins)"
-    src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/feedback"
-    time=0
+name="Giving Feedback"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/feedback"
+time=60
+[[blocks]]
+name="Morning break"
+src="blocks/morning-break"
+time=20
+[[blocks]]
+name="Arrays"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/feedback"
+time=60
 [[blocks]]
 name="lunch"
 src="blocks/lunch"
diff --git a/org-cyf-itp/content/data-groups/sprints/2/day-plan/index.md b/org-cyf-itp/content/data-groups/sprints/2/day-plan/index.md
@@ -12,17 +12,17 @@ name="Morning orientation"
 src="blocks/morning-orientation"
 time=15
 [[blocks]]
-name="Workshop"
-src="blocks/workshop"
-time="140"
-  [[blocks.nested.blocks]]
-    name="Objects [Tech] (60 Mins)"
-    src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/objects"
-    time=0
-  [[blocks.nested.blocks]]
-    name="Debugging 2 [Tech] (60 Mins)"
-    src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/debugging-2"
-    time=0
+name="Objects"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/objects"
+time=60
+[[blocks]]
+name="Morning break"
+src="blocks/morning-break"
+time=20
+[[blocks]]
+name="Debugging"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/debugging"
+time=60
 [[blocks]]
 name="lunch"
 src="blocks/lunch"
diff --git a/org-cyf-itp/content/data-groups/sprints/3/day-plan/index.md b/org-cyf-itp/content/data-groups/sprints/3/day-plan/index.md
@@ -12,17 +12,17 @@ name="Morning orientation"
 src="blocks/morning-orientation"
 time=15
 [[blocks]]
-name="Workshop"
-src="blocks/workshop"
-time="140"
-  [[blocks.nested.blocks]]
-    name="DOM merge conflict [Tech] (60 Mins)"
-    src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/dom-merge-conflict"
-    time=0
-    [[blocks.nested.blocks]]
-    name="Interviewing practice [PD] (60 Mins)"
-    src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/interviewing"
-    time=0
+name="DOM merge conflict"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/dom-merge-conflict"
+time=60
+[[blocks]]
+name="Morning break"
+src="blocks/morning-break"
+time=20
+[[blocks]]
+name="Interviewing practice"
+src="https://github.com/CodeYourFuture/CYF-Workshops/tree/main/interviewing"
+time=60
 [[blocks]]
 name="lunch"
 src="blocks/lunch"
diff --git a/org-cyf-itp/go.mod b/org-cyf-itp/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-itp
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240905150045-7be086ff6886 // indirect
diff --git a/org-cyf-launch/go.mod b/org-cyf-launch/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-launch
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240721130916-d70fc853a278 // indirect
diff --git a/org-cyf-piscine/go.mod b/org-cyf-piscine/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-piscine
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/org-cyf-sdc/go.mod b/org-cyf-sdc/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-sdc
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.0 // indirect
diff --git a/org-cyf-theme/data/courses/itp.toml b/org-cyf-theme/data/courses/itp.toml
@@ -8,4 +8,4 @@ emoji="🐣"
 days=91
 commitment="part time"
 frequency=3
-locations=["Birmingham", "Capetown", "Glasgow", "London", "Manchester", "Online", "Sheffield"]
+locations=["Birmingham", "Capetown", "Glasgow", "London", "Manchester", "Sheffield"]
diff --git a/org-cyf-theme/data/courses/piscine.toml b/org-cyf-theme/data/courses/piscine.toml
@@ -8,4 +8,4 @@ url="https://piscine.codeyourfuture.io/"
 days="22"
 commitment="part time"
 frequency=3
-locations=["Birmingham", "Capetown", "Glasgow", "London", "Manchester", "Online", "Sheffield"]
+locations=["Birmingham", "Capetown", "Glasgow", "London", "Manchester", "Sheffield"]
diff --git a/org-cyf-theme/data/courses/sdc.toml b/org-cyf-theme/data/courses/sdc.toml
@@ -8,4 +8,4 @@ description="A secure grounding in software: binary, logic, systems, and problem
 days="84"
 commitment="part time"
 frequency=3
-locations=["Birmingham", "Capetown", "Glasgow", "London", "Manchester", "Online", "Sheffield"]
+locations=["Birmingham", "Capetown", "Glasgow", "London", "Manchester", "Sheffield"]
diff --git a/org-cyf-theme/go.mod b/org-cyf-theme/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-theme
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/org-cyf-tracks/go.mod b/org-cyf-tracks/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf-tracks
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/CYF-PD v1.0.1-0.20240905150045-7be086ff6886 // indirect
diff --git a/org-cyf/go.mod b/org-cyf/go.mod
@@ -1,6 +1,6 @@
 module github.com/CodeYourFuture/curriculum/org-cyf
 
-go 1.22.6
+go 1.24.5
 
 require (
 	github.com/CodeYourFuture/curriculum/common-content v0.0.0-20241008095008-281a5517463f // indirect
diff --git a/tooling/build_all_sites.sh b/tooling/build_all_sites.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)"
+REPO_ROOT="$(cd "${SCRIPT_DIR}" && cd .. && pwd)"
+
+for dir in $(find "${REPO_ROOT}" -type d -maxdepth 1 -not -name .git -not -name tooling); do
+  if [[ ! -e "${dir}/package.json" ]]; then
+    continue
+  fi
+  cd "${dir}"
+  echo >&2 "Trying to build in ${dir}"
+  npm install
+  npm run build:dev || { echo >&2 "Failed to build in ${dir}"; exit 1; }
+done
diff --git a/tooling/common-config/netlify.toml b/tooling/common-config/netlify.toml
@@ -2,15 +2,26 @@
 ignore = "exit 1" #always build on PR even if you can't detect changes in this folder
 publish = "public"
 command = "./deploy-netlify.sh"
+
+[build.environment]
+  GO_VERSION = "1.24.5"
+  HUGO_VERSION = "0.136.3"
+  NODE_VERSION = "20"
+  NPM_FLAGS = "--legacy-peer-deps"
+
+
 [dev]
 framework = "hugo"
 targetPort = 3000
 command = "hugo server -p 3000"
+
 [[redirects]]
 from = "/api/*"
 to = "/.netlify/functions/:splat"
 status = 200
+
 [functions]
+directory = "tooling/netlify/functions"
 external_node_modules = ["node-fetch"]
 
 [[headers]]
diff --git a/tooling/go/cmd/site-consistency/main.go b/tooling/go/cmd/site-consistency/main.go
diff --git a/tooling/go/go.mod b/tooling/go/go.mod
diff --git a/tooling/go/go.sum b/tooling/go/go.sum

Original file line number	Diff line number	Diff line change
`@@ -10,4 +10,4 @@ hide_from_overview=true`
`10`	`10`
`11`	`11`	`+++`
`12`	`12`
`13`		`-A quick break of fifteen minutes so we can all concentrate on the next piece of work.`
	`13`	`+A quick break so we can all concentrate on the next piece of work.`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`module github.com/CodeYourFuture/curriculum/common-content`
`2`	`2`
`3`		`-go 1.21.3`
	`3`	`+go 1.24.5`