From 9cb07382cfbdeb94e276a3cf65180e050a3aa59f Mon Sep 17 00:00:00 2001
From: Aaron Dodson <aaron.dodson@raspberrypi.org>
Date: Mon, 16 Feb 2026 10:40:01 -0800
Subject: [PATCH 1/5] fix: Fix gulpfiles related to publishing GitHub pages

---
 packages/blockly/gulpfile.mjs                 | 12 -------
 .../blockly/scripts/gulpfiles/git_tasks.mjs   | 34 +++++++------------
 .../scripts/gulpfiles/release_tasks.mjs       |  2 +-
 3 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/packages/blockly/gulpfile.mjs b/packages/blockly/gulpfile.mjs
index ad61bcb516d..d2784b3a16f 100644
--- a/packages/blockly/gulpfile.mjs
+++ b/packages/blockly/gulpfile.mjs
@@ -35,15 +35,12 @@ import {
 import {docs} from './scripts/gulpfiles/docs_tasks.mjs';
 import {
   createRC,
-  syncDevelop,
-  syncMaster,
   updateGithubPages,
 } from './scripts/gulpfiles/git_tasks.mjs';
 import {cleanReleaseDir, pack} from './scripts/gulpfiles/package_tasks.mjs';
 import {
   publish,
   publishBeta,
-  recompile,
 } from './scripts/gulpfiles/release_tasks.mjs';
 import {
   generators,
@@ -89,12 +86,3 @@ export {
   createRC as gitCreateRC,
   docs,
 }
-
-// Legacy targets, to be deleted.
-//
-// prettier-ignore
-export {
-  recompile,
-  syncDevelop as gitSyncDevelop,
-  syncMaster as gitSyncMaster,
-}
diff --git a/packages/blockly/scripts/gulpfiles/git_tasks.mjs b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
index 2b08e16b38b..3b641691cf0 100644
--- a/packages/blockly/scripts/gulpfiles/git_tasks.mjs
+++ b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
@@ -14,11 +14,11 @@ import {execSync} from 'child_process';
 import * as buildTasks from './build_tasks.mjs';
 import * as packageTasks from './package_tasks.mjs';
 
-const UPSTREAM_URL = 'https://github.com/google/blockly.git';
+const UPSTREAM_URL = 'git@github.com:RaspberryPiFoundation/blockly.git';
 
 /**
  * Extra paths to include in the gh_pages branch (beyond the normal
- * contents of master / develop).  Passed to shell unquoted, so can
+ * contents of main).  Passed to shell unquoted, so can
  * include globs.
  */
 const EXTRAS = [
@@ -37,7 +37,7 @@ let upstream = null;
 function getUpstream() {
   if (upstream) return upstream;
   for (const line of String(execSync('git remote -v')).split('\n')) {
-    if (line.includes('google/blockly')) {
+    if (line.includes('RaspberryPiFoundation/blockly')) {
       upstream = line.split('\t')[0];
       return upstream;
     }
@@ -47,7 +47,7 @@ function getUpstream() {
 
 /**
  * Stash current state, check out the named branch, and sync with
- * google/blockly.
+ * RaspberryPiFoundation/blockly.
  */
 function syncBranch(branchName) {
   return function(done) {
@@ -60,19 +60,11 @@ function syncBranch(branchName) {
 }
 
 /**
- * Stash current state, check out develop, and sync with
- * google/blockly.
+ * Stash current state, check out main, and sync with
+ * RaspberryPiFoundation/blockly.
  */
-export function syncDevelop() {
-  return syncBranch('develop');
-};
-
-/**
- * Stash current state, check out master, and sync with
- * google/blockly.
- */
-export function syncMaster() {
-  return syncBranch('master');
+export function syncMain() {
+  return syncBranch('main');
 };
 
 /**
@@ -109,10 +101,10 @@ function checkoutBranch(branchName) {
 
 /**
  * Create and push an RC branch.
- * Note that this pushes to google/blockly.
+ * Note that this pushes to RaspberryPiFoundation/blockly.
  */
 export const createRC = gulp.series(
-  syncDevelop(),
+  syncMain(),
   function(done) {
     const branchName = getRCBranchName();
     execSync(`git switch -C ${branchName}`, { stdio: 'inherit' });
@@ -136,12 +128,12 @@ export function pushRebuildBranch(done) {
   const branchName = getRebuildBranchName();
   execSync(`git push origin ${branchName}`, { stdio: 'inherit' });
   console.log(`Branch ${branchName} pushed to GitHub.`);
-  console.log('Next step: create a pull request against develop.');
+  console.log('Next step: create a pull request against main.');
   done();
 }
 
 /**
- * Update github pages with what is currently in develop.
+ * Update github pages with what is currently in main.
  *
  * Prerequisites (invoked): clean, build.
  */
@@ -150,7 +142,7 @@ export const updateGithubPages = gulp.series(
     execSync('git stash save -m "Stash for sync"', { stdio: 'inherit' });
     execSync('git switch -C gh-pages', { stdio: 'inherit' });
     execSync(`git fetch ${getUpstream()}`, { stdio: 'inherit' });
-    execSync(`git reset --hard ${getUpstream()}/develop`, { stdio: 'inherit' });
+    execSync(`git reset --hard ${getUpstream()}/main`, { stdio: 'inherit' });
     done();
   },
   buildTasks.cleanBuildDir,
diff --git a/packages/blockly/scripts/gulpfiles/release_tasks.mjs b/packages/blockly/scripts/gulpfiles/release_tasks.mjs
index a678a4f2436..3abeba52f68 100644
--- a/packages/blockly/scripts/gulpfiles/release_tasks.mjs
+++ b/packages/blockly/scripts/gulpfiles/release_tasks.mjs
@@ -166,7 +166,7 @@ export const publishBeta = gulp.series(
 // Switch to a new branch, update the version number, build Blockly
 // and check in the resulting built files.
 export const recompile = gulp.series(
-  gitTasks.syncDevelop(),
+  gitTasks.syncMain(),
   gitTasks.createRebuildBranch,
   updateVersionPrompt,
   packageTasks.pack,  // Does clean + build.

From b79b7f05cabe227937a5c130f43e955e9de5315e Mon Sep 17 00:00:00 2001
From: Maribeth Moffatt <maribeth.moffatt@raspberrypi.org>
Date: Tue, 17 Feb 2026 13:16:52 -0500
Subject: [PATCH 2/5] chore: remove unused gulp tasks

---
 packages/blockly/gulpfile.mjs                 |  1 -
 packages/blockly/package.json                 |  2 -
 .../blockly/scripts/gulpfiles/git_tasks.mjs   | 83 +------------------
 .../scripts/gulpfiles/release_tasks.mjs       | 59 -------------
 4 files changed, 4 insertions(+), 141 deletions(-)

diff --git a/packages/blockly/gulpfile.mjs b/packages/blockly/gulpfile.mjs
index d2784b3a16f..fa5a21c0aa8 100644
--- a/packages/blockly/gulpfile.mjs
+++ b/packages/blockly/gulpfile.mjs
@@ -83,6 +83,5 @@ export {
   generators as testGenerators,
   interactiveMocha,
   buildAdvancedCompilationTest,
-  createRC as gitCreateRC,
   docs,
 }
diff --git a/packages/blockly/package.json b/packages/blockly/package.json
index 450fd302a71..554853cfad3 100644
--- a/packages/blockly/package.json
+++ b/packages/blockly/package.json
@@ -38,8 +38,6 @@
     "prepareDemos": "gulp prepareDemos",
     "publish": "npm ci && gulp publish",
     "publish:beta": "npm ci && gulp publishBeta",
-    "recompile": "gulp recompile",
-    "release": "gulp gitCreateRC",
     "start": "npm run build && concurrently -n tsc,server \"tsc --watch --preserveWatchOutput --outDir \"build/src\" --declarationDir \"build/declarations\"\" \"http-server ./ -s -o /tests/playground.html -c-1\"",
     "tsc": "gulp tsc",
     "test": "gulp test",
diff --git a/packages/blockly/scripts/gulpfiles/git_tasks.mjs b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
index 3b641691cf0..b3f38ffa2eb 100644
--- a/packages/blockly/scripts/gulpfiles/git_tasks.mjs
+++ b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
@@ -28,33 +28,15 @@ const EXTRAS = [
   'build/*.loader.mjs',
 ];
 
-let upstream = null;
-
 /**
- * Get name of git remote for upstream (typically 'upstream', but this
- * is just convention and can be changed.)
- */
-function getUpstream() {
-  if (upstream) return upstream;
-  for (const line of String(execSync('git remote -v')).split('\n')) {
-    if (line.includes('RaspberryPiFoundation/blockly')) {
-      upstream = line.split('\t')[0];
-      return upstream;
-    }
-  }
-  throw new Error('Unable to determine upstream URL');
-}
-
-/**
- * Stash current state, check out the named branch, and sync with
- * RaspberryPiFoundation/blockly.
+ * Stash current state, check out the named branch, and pull
+ * changes from RaspberryPiFoundation/blockly.
  */
 function syncBranch(branchName) {
   return function(done) {
     execSync('git stash save -m "Stash for sync"', { stdio: 'inherit' });
     checkoutBranch(branchName);
     execSync(`git pull ${UPSTREAM_URL} ${branchName}`, { stdio: 'inherit' });
-    execSync(`git push origin ${branchName}`, { stdio: 'inherit' });
     done();
   };
 }
@@ -67,29 +49,6 @@ export function syncMain() {
   return syncBranch('main');
 };
 
-/**
- * Helper function: get a name for a rebuild branch. Format:
- * rebuild_mm_dd_yyyy.
- */
-function getRebuildBranchName() {
-  const date = new Date();
-  const mm = date.getMonth() + 1;  // Month, 0-11
-  const dd = date.getDate();  // Day of the month, 1-31
-  const yyyy = date.getFullYear();
-  return `rebuild_${mm}_${dd}_${yyyy}`;
-};
-
-/**
- * Helper function: get a name for a rebuild branch. Format:
- * rebuild_yyyy_mm.
- */
-function getRCBranchName() {
-  const date = new Date();
-  const mm = date.getMonth() + 1;  // Month, 0-11
-  const yyyy = date.getFullYear();
-  return `rc_${yyyy}_${mm}`;
-};
-
 /**
  * If branch does not exist then create the branch.
  * If branch exists switch to branch.
@@ -99,50 +58,16 @@ function checkoutBranch(branchName) {
       { stdio: 'inherit' });
 }
 
-/**
- * Create and push an RC branch.
- * Note that this pushes to RaspberryPiFoundation/blockly.
- */
-export const createRC = gulp.series(
-  syncMain(),
-  function(done) {
-    const branchName = getRCBranchName();
-    execSync(`git switch -C ${branchName}`, { stdio: 'inherit' });
-    execSync(`git push ${UPSTREAM_URL} ${branchName}`, { stdio: 'inherit' });
-    done();
-  }
-);
-
-/** Create the rebuild branch. */
-export function createRebuildBranch(done) {
-  const branchName = getRebuildBranchName();
-  console.log(`make-rebuild-branch: creating branch ${branchName}`);
-  execSync(`git switch -C ${branchName}`, { stdio: 'inherit' });
-  done();
-}
-
-/** Push the rebuild branch to origin. */
-export function pushRebuildBranch(done) {
-  console.log('push-rebuild-branch: committing rebuild');
-  execSync('git commit -am "Rebuild"', { stdio: 'inherit' });
-  const branchName = getRebuildBranchName();
-  execSync(`git push origin ${branchName}`, { stdio: 'inherit' });
-  console.log(`Branch ${branchName} pushed to GitHub.`);
-  console.log('Next step: create a pull request against main.');
-  done();
-}
-
 /**
  * Update github pages with what is currently in main.
  *
  * Prerequisites (invoked): clean, build.
  */
 export const updateGithubPages = gulp.series(
+  syncMain,
   function(done) {
-    execSync('git stash save -m "Stash for sync"', { stdio: 'inherit' });
     execSync('git switch -C gh-pages', { stdio: 'inherit' });
-    execSync(`git fetch ${getUpstream()}`, { stdio: 'inherit' });
-    execSync(`git reset --hard ${getUpstream()}/main`, { stdio: 'inherit' });
+    execSync(`git reset --hard main`, { stdio: 'inherit' });
     done();
   },
   buildTasks.cleanBuildDir,
diff --git a/packages/blockly/scripts/gulpfiles/release_tasks.mjs b/packages/blockly/scripts/gulpfiles/release_tasks.mjs
index 3abeba52f68..ca9c9ffa1bc 100644
--- a/packages/blockly/scripts/gulpfiles/release_tasks.mjs
+++ b/packages/blockly/scripts/gulpfiles/release_tasks.mjs
@@ -18,55 +18,6 @@ import * as packageTasks from './package_tasks.mjs';
 import {getPackageJson} from './helper_tasks.mjs';
 import {RELEASE_DIR} from './config.mjs';
 
-
-// Gets the current major version.
-function getMajorVersion() {
-  const { version } = getPackageJson();
-  const re = new RegExp(/^(\d)./);
-  const match = re.exec(version);
-  if (!match[0]) {
-    return null;
-  }
-  console.log(match[0]);
-  return parseInt(match[0]);
-}
-
-// Updates the version depending on user input.
-function updateVersion(done, updateType) {
-  const majorVersion = getMajorVersion();
-  if (!majorVersion) {
-    done(new Error('Something went wrong when getting the major version number.'));
-  } else if (!updateType) {
-    // User selected to cancel.
-    done(new Error('Cancelling process.'));
-  }
-
-  switch (updateType.toLowerCase()) {
-    case 'major':
-      majorVersion++;
-      execSync(`npm --no-git-tag-version version ${majorVersion}.$(date +'%Y%m%d').0`, {stdio: 'inherit'});
-      done();
-      break;
-    case 'minor':
-      execSync(`npm --no-git-tag-version version ${majorVersion}.$(date +'%Y%m%d').0`, {stdio: 'inherit'});
-      done();
-      break;
-    case 'patch':
-      execSync(`npm --no-git-tag-version version patch`, {stdio: 'inherit'});
-      done();
-      break;
-    default:
-      done(new Error('Unexpected update type was chosen.'))
-  }
-}
-
-// Prompt the user to figure out what kind of version update we should do.
-function updateVersionPrompt(done) {
-  const releaseTypes = ['Major', 'Minor', 'Patch'];
-  const index = readlineSync.keyInSelect(releaseTypes, 'Which version type?');
-  updateVersion(done, releaseTypes[index]);
-}
-
 // Checks with the user that they are on the correct git branch.
 function checkBranch(done) {
   const gitBranchName = execSync('git rev-parse --abbrev-ref HEAD').toString();
@@ -162,13 +113,3 @@ export const publishBeta = gulp.series(
   checkReleaseDir,
   loginAndPublishBeta
 );
-
-// Switch to a new branch, update the version number, build Blockly
-// and check in the resulting built files.
-export const recompile = gulp.series(
-  gitTasks.syncMain(),
-  gitTasks.createRebuildBranch,
-  updateVersionPrompt,
-  packageTasks.pack,  // Does clean + build.
-  gitTasks.pushRebuildBranch
-  );

From 702791c84898de30ecec7cacf2b0d0d5bc776cee Mon Sep 17 00:00:00 2001
From: Maribeth Moffatt <maribeth.moffatt@raspberrypi.org>
Date: Fri, 27 Feb 2026 13:42:05 -0500
Subject: [PATCH 3/5] feat: allow passing a remote to push gh-pages to

---
 packages/blockly/gulpfile.mjs                 | 12 +--
 packages/blockly/package.json                 |  2 +-
 .../blockly/scripts/gulpfiles/git_tasks.mjs   | 92 +++++++++++++++----
 3 files changed, 77 insertions(+), 29 deletions(-)

diff --git a/packages/blockly/gulpfile.mjs b/packages/blockly/gulpfile.mjs
index fa5a21c0aa8..378d6ce5efa 100644
--- a/packages/blockly/gulpfile.mjs
+++ b/packages/blockly/gulpfile.mjs
@@ -33,15 +33,9 @@ import {
   tsc,
 } from './scripts/gulpfiles/build_tasks.mjs';
 import {docs} from './scripts/gulpfiles/docs_tasks.mjs';
-import {
-  createRC,
-  updateGithubPages,
-} from './scripts/gulpfiles/git_tasks.mjs';
+import {updateGithubPages} from './scripts/gulpfiles/git_tasks.mjs';
 import {cleanReleaseDir, pack} from './scripts/gulpfiles/package_tasks.mjs';
-import {
-  publish,
-  publishBeta,
-} from './scripts/gulpfiles/release_tasks.mjs';
+import {publish, publishBeta} from './scripts/gulpfiles/release_tasks.mjs';
 import {
   generators,
   interactiveMocha,
@@ -69,7 +63,7 @@ export {
   prepareDemos,
   deployDemosBeta,
   deployDemos,
-  updateGithubPages as gitUpdateGithubPages,
+  updateGithubPages,
 }
 
 // Manually-invokable targets that also invoke prerequisites where
diff --git a/packages/blockly/package.json b/packages/blockly/package.json
index 554853cfad3..ac0cf6e8d58 100644
--- a/packages/blockly/package.json
+++ b/packages/blockly/package.json
@@ -45,7 +45,7 @@
     "test:generators": "gulp testGenerators",
     "test:mocha:interactive": "npm run build && concurrently -n tsc,server \"tsc --watch --preserveWatchOutput --outDir \"build/src\" --declarationDir \"build/declarations\"\" \"gulp interactiveMocha\"",
     "test:compile:advanced": "gulp buildAdvancedCompilationTest --debug",
-    "updateGithubPages": "npm ci && gulp gitUpdateGithubPages"
+    "updateGithubPages": "npm ci && gulp updateGithubPages -- --upstream"
   },
   "exports": {
     ".": {
diff --git a/packages/blockly/scripts/gulpfiles/git_tasks.mjs b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
index b3f38ffa2eb..90c89f81674 100644
--- a/packages/blockly/scripts/gulpfiles/git_tasks.mjs
+++ b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
@@ -8,14 +8,29 @@
  * @fileoverview Git-related gulp tasks for Blockly.
  */
 
+
 import * as gulp from 'gulp';
 import {execSync} from 'child_process';
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
 
 import * as buildTasks from './build_tasks.mjs';
 import * as packageTasks from './package_tasks.mjs';
 
 const UPSTREAM_URL = 'git@github.com:RaspberryPiFoundation/blockly.git';
 
+// Use yargs to parse --remote argument
+const argv = yargs(hideBin(process.argv)).option('remote', {
+    type: 'string',
+    describe: 'Remote to push gh-pages to',
+    demandOption: false
+}).option('upstream', {
+  type: 'boolean',
+  describe: 'Push to RaspberryPiFoundation/blockly instead of origin',
+  demandOption: false
+}).help().argv;
+const remoteToUse = argv.upstream ? UPSTREAM_URL : resolveRemote(argv.remote);
+
 /**
  * Extra paths to include in the gh_pages branch (beyond the normal
  * contents of main).  Passed to shell unquoted, so can
@@ -50,11 +65,11 @@ export function syncMain() {
 };
 
 /**
- * If branch does not exist then create the branch.
  * If branch exists switch to branch.
+ * If branch does not exist then create the branch.
  */
 function checkoutBranch(branchName) {
-  execSync(`git switch -c ${branchName}`,
+  execSync(`git switch ${branchName} || git switch -c ${branchName}`,
       { stdio: 'inherit' });
 }
 
@@ -62,23 +77,62 @@ function checkoutBranch(branchName) {
  * Update github pages with what is currently in main.
  *
  * Prerequisites (invoked): clean, build.
+ * 
+ * Usage:
+ *   gulp updateGithubPages # uses origin if exists
+ *   gulp updateGithubPages --upstream # uses hardcoded upstream
+ *   gulp updateGithubPages --remote <remote> # uses named remote
+ *
  */
 export const updateGithubPages = gulp.series(
-  syncMain,
-  function(done) {
-    execSync('git switch -C gh-pages', { stdio: 'inherit' });
-    execSync(`git reset --hard main`, { stdio: 'inherit' });
-    done();
-  },
-  buildTasks.cleanBuildDir,
-  packageTasks.cleanReleaseDir,
-  buildTasks.build,
-  function(done) {
-    // Extra paths (e.g. build/, dist/ etc.) are normally gitignored,
-    // so we have to force add.
-    execSync(`git add -f ${EXTRAS.join(' ')}`, {stdio: 'inherit'});
-    execSync('git commit -am "Rebuild"', {stdio: 'inherit'});
-    execSync(`git push ${UPSTREAM_URL} gh-pages --force`, {stdio: 'inherit'});
-    done();
+    function (done) {
+        if (!remoteToUse) {
+          const attemptedRemote = argv.remote || 'origin';
+          const remoteLabel = argv.remote
+            ? `Remote '${attemptedRemote}'`
+            : "Remote 'origin' (default)";
+          const errMsg = `${remoteLabel} not found in git remotes. ` +
+            'Please add that remote or use --upstream.\n' +
+            'Usage: gulp updateGithubPages [--remote <remote> | --upstream]';
+          console.error(errMsg);
+          done(new Error(errMsg));
+          return;
+        }
+        done();
+    },
+    syncMain(),
+    function(done) {
+      execSync('git switch -C gh-pages', { stdio: 'inherit' });
+      execSync(`git reset --hard main`, { stdio: 'inherit' });
+      done();
+    },
+    buildTasks.cleanBuildDir,
+    packageTasks.cleanReleaseDir,
+    buildTasks.build,
+    function(done) {
+      // Extra paths (e.g. build/, dist/ etc.) are normally gitignored,
+      // so we have to force add.
+      execSync(`git add -f ${EXTRAS.join(' ')}`, {stdio: 'inherit'});
+      execSync('git commit -am "Rebuild"', {stdio: 'inherit'});
+      execSync(`git push ${remoteToUse} gh-pages --force`, {stdio: 'inherit'});
+      done();
+    }
+  );
+
+/**
+ * Resolves which remote to use for pushing gh-pages.
+ * @param {string} remoteArg
+ * @returns {string|undefined} The remote name, or undefined if not found.
+ */
+function resolveRemote(remoteArg) {
+  const remoteName = remoteArg || 'origin';
+  try {
+    const remotes = execSync('git remote', {encoding: 'utf8'}).split(/\r?\n/).map(r => r.trim()).filter(Boolean);
+    if (remotes.includes(remoteName)) {
+      return remoteName;
+    }
+    return undefined;
+  } catch (e) {
+    return undefined;
   }
-);
+}

From d9629ab557640caf0f7c377894d59883049d24c5 Mon Sep 17 00:00:00 2001
From: Maribeth Moffatt <maribeth.moffatt@raspberrypi.org>
Date: Fri, 27 Feb 2026 13:51:20 -0500
Subject: [PATCH 4/5] feat: add ability to skip syncing with main

---
 packages/blockly/package.json                 |  3 +-
 .../blockly/scripts/gulpfiles/git_tasks.mjs   | 40 ++++++++++++++++---
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/packages/blockly/package.json b/packages/blockly/package.json
index ac0cf6e8d58..ffd12bd76d3 100644
--- a/packages/blockly/package.json
+++ b/packages/blockly/package.json
@@ -45,7 +45,8 @@
     "test:generators": "gulp testGenerators",
     "test:mocha:interactive": "npm run build && concurrently -n tsc,server \"tsc --watch --preserveWatchOutput --outDir \"build/src\" --declarationDir \"build/declarations\"\" \"gulp interactiveMocha\"",
     "test:compile:advanced": "gulp buildAdvancedCompilationTest --debug",
-    "updateGithubPages": "npm ci && gulp updateGithubPages -- --upstream"
+    "updateGithubPages": "npm ci && gulp updateGithubPages --upstream",
+    "updateGithubPages:staging": "npm ci && gulp updateGithubPages --use-local"
   },
   "exports": {
     ".": {
diff --git a/packages/blockly/scripts/gulpfiles/git_tasks.mjs b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
index 90c89f81674..6a68b54becf 100644
--- a/packages/blockly/scripts/gulpfiles/git_tasks.mjs
+++ b/packages/blockly/scripts/gulpfiles/git_tasks.mjs
@@ -28,6 +28,10 @@ const argv = yargs(hideBin(process.argv)).option('remote', {
   type: 'boolean',
   describe: 'Push to RaspberryPiFoundation/blockly instead of origin',
   demandOption: false
+}).option('use-local', {
+  type: 'boolean',
+  describe: 'Build and push from current branch instead of syncing with main',
+  demandOption: false
 }).help().argv;
 const remoteToUse = argv.upstream ? UPSTREAM_URL : resolveRemote(argv.remote);
 
@@ -74,14 +78,15 @@ function checkoutBranch(branchName) {
 }
 
 /**
- * Update github pages with what is currently in main.
+ * Update github pages with what is currently in main (or current branch if --use-local).
  *
  * Prerequisites (invoked): clean, build.
- * 
+ *
  * Usage:
- *   gulp updateGithubPages # uses origin if exists
+ *   gulp updateGithubPages # sync main, then use origin if exists
  *   gulp updateGithubPages --upstream # uses hardcoded upstream
  *   gulp updateGithubPages --remote <remote> # uses named remote
+ *   gulp updateGithubPages --use-local # build from current branch, skip syncing main
  *
  */
 export const updateGithubPages = gulp.series(
@@ -100,10 +105,35 @@ export const updateGithubPages = gulp.series(
         }
         done();
     },
-    syncMain(),
+    function (done) {
+      if (!argv.useLocal) {
+        done();
+        return;
+      }
+      const status = execSync('git status --porcelain', { encoding: 'utf8' });
+      if (status.trim()) {
+        const errMsg =
+          'You cannot push the local branch with uncommitted changes. ' +
+          'Please commit or stash your changes first.';
+        console.error(errMsg);
+        done(new Error(errMsg));
+        return;
+      }
+      done();
+    },
+    function (done) {
+      if (argv.useLocal) {
+        done();
+        return;
+      }
+      syncMain()(done);
+    },
     function(done) {
+      const sourceRef = argv.useLocal
+        ? execSync('git rev-parse HEAD', { encoding: 'utf8' }).trim()
+        : 'main';
       execSync('git switch -C gh-pages', { stdio: 'inherit' });
-      execSync(`git reset --hard main`, { stdio: 'inherit' });
+      execSync(`git reset --hard ${sourceRef}`, { stdio: 'inherit' });
       done();
     },
     buildTasks.cleanBuildDir,

From b312e415ca29a860ef203d283e694d941ebc04e5 Mon Sep 17 00:00:00 2001
From: Maribeth Moffatt <maribeth.moffatt@raspberrypi.org>
Date: Fri, 27 Feb 2026 14:26:45 -0500
Subject: [PATCH 5/5] feat: add gh workflow to publish ghpages

---
 .github/workflows/update-gh-pages.yml | 36 +++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 .github/workflows/update-gh-pages.yml

diff --git a/.github/workflows/update-gh-pages.yml b/.github/workflows/update-gh-pages.yml
new file mode 100644
index 00000000000..aa19a1b8b55
--- /dev/null
+++ b/.github/workflows/update-gh-pages.yml
@@ -0,0 +1,36 @@
+# Manual workflow to update GitHub Pages from a chosen source branch.
+# The gulp updateGithubPages task builds the repo and force-pushes to gh-pages.
+
+name: Update GitHub Pages
+
+on:
+  workflow_dispatch:
+    inputs:
+      source_branch:
+        description: 'Source branch to build and deploy to GitHub Pages'
+        required: true
+        type: string
+        default: main
+
+permissions:
+  contents: write
+
+jobs:
+  update-gh-pages:
+    timeout-minutes: 15
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v5
+        with:
+          ref: ${{ inputs.source_branch }}
+          fetch-depth: 0
+
+      - name: Use Node.js
+        uses: actions/setup-node@v5
+        with:
+          node-version: 20.x
+
+      - name: Update GitHub Pages
+        working-directory: ./packages/blockly
+        run: npm run updateGithubPages:staging