From 7039acaab56a3155400a0ac06d04ccf710c912b9 Mon Sep 17 00:00:00 2001 From: Peter Corke Date: Mon, 17 Aug 2026 10:39:59 +1000 Subject: [PATCH] chore: retire the stale future branch future was 162 commits behind main, 0 ahead, last touched 2026-06-14 -- a leftover from before RTB used a proper PR-based workflow, no longer part of how anything actually merges (confirmed by MVTB and bdsim, Peter's other actively-maintained repos, which have already dropped their own future branches entirely -- RTB was the outlier still carrying it). Third-party repos (swift, spatialgeometry) still use their own future branch as the live PR-merge target, set by their own owners -- not touched here, unrelated to RTB's now-dead one. - ci.yml: drop future from push/pull_request trigger branches - pull_request_template.md: stop telling contributors to target future - README.md: fix a stray image URL pointing at future/docs/figs/... -- would have 404'd once the branch was actually deleted PR #594 (open, targeting future) retargeted to main separately before this merges, so it isn't orphaned by the branch deletion. --- .github/pull_request_template.md | 2 +- .github/workflows/ci.yml | 6 +++--- README.md | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index d4b2aa6f5..64106e583 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -2,7 +2,7 @@ We thank you in advance for your pull request, and for your interest and support You could help us a lot by: -* Making your pull request relative to the `future` branch. This is where we fix issues and merge pull requests prior to pushing out a new release. +* Making your pull request relative to the `main` branch. * Including a reference/link to any related issues. * Providing a clear description of the problem you are addressing with the pull request, the changes proposed, and their rationale. * We appreciate code comments explaining what your added block of code does. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index db0f69481..39d86a5b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -1,5 +1,5 @@ # Run tests, coverage, and build docs across all supported platforms -# Triggers on pushes/PRs to main and the active dev branch. +# Triggers on pushes/PRs to main. # # spatialgeometry and swift-sim are installed from GitHub HEAD because the # current PyPI releases were compiled against NumPy 1.x and crash under 2.x. @@ -10,9 +10,9 @@ name: CI on: push: - branches: [main, future] + branches: [main] pull_request: - branches: [main, future] + branches: [main] env: FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true diff --git a/README.md b/README.md index b76e15431..a41c6b915 100644 --- a/README.md +++ b/README.md @@ -446,7 +446,7 @@ K. He, R. Newbury, T. Tran, J. Haviland, B. Burgess-Limerick, D. Kulić, P. Cork

- +