From a90db610e0af7da27d8bfe6a278ee651743a5be5 Mon Sep 17 00:00:00 2001
From: Stephan Butler <stephan@interledger.foundation>
Date: Wed, 16 Sep 2026 10:40:06 +0200
Subject: [PATCH] ci: branch rename of 'v1.x' to 'v1'

---
 .github/workflows/e2e.yml     |  2 +-
 .github/workflows/release.yml |  6 +++---
 release.config.js             | 12 ++++++------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index 367317fe4..a000e7c05 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -4,7 +4,7 @@ on:
   pull_request:
     branches:
       - main
-      - v1.x
+      - v1
     types:
       - opened
       - synchronize
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 43d65ca65..cc6f61e8c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -22,8 +22,8 @@ jobs:
       - name: Check branch is releasable
         run: |
           BRANCH="${{ github.ref_name }}"
-          if [ "$BRANCH" != "main" ] && [ "$BRANCH" != "v1.x" ] && ! echo "$BRANCH" | grep -qE '^release/v[0-9]+\.[0-9]+$'; then
-            echo "::error::Releases can only be created from 'main', 'v1.x' or 'release/vX.Y' branches. Current branch: $BRANCH"
+          if [ "$BRANCH" != "main" ] && [ "$BRANCH" != "v1" ] && ! echo "$BRANCH" | grep -qE '^release/v[0-9]+\.[0-9]+$'; then
+            echo "::error::Releases can only be created from 'main', 'v1' or 'release/vX.Y' branches. Current branch: $BRANCH"
             exit 1
           fi
           echo "Branch '$BRANCH' is valid for release."
@@ -199,7 +199,7 @@ jobs:
             echo 'tags<<TAGS_EOF'
             echo "${IMAGE}:${VERSION}"
             # Push ":latest" only from `main`. ":latest" points to the
-            # production image. A release from `v1.x` must not move it to the
+            # production image. A release from `v1` must not move it to the
             # next-major line.
             if [ "$BRANCH" = "main" ]; then
               echo "${IMAGE}:latest"
diff --git a/release.config.js b/release.config.js
index d4e2a9039..798d1268d 100644
--- a/release.config.js
+++ b/release.config.js
@@ -1,17 +1,17 @@
 // Release branches, in ascending version order. semantic-release derives the
 // version range each branch may publish from the tags on the branches after it:
 //
-//   - main  The 0.x production line. When v1.x holds a v1.0.0 tag, main is
+//   - main  The 0.x production line. When v1 holds a v1.0.0 tag, main is
 //           clamped to ">=0.x <1.0.0" and accepts only patch and minor. A
 //           breaking change merged here then fails the release with
 //           EINVALIDNEXTVERSION. That failure is the guardrail, not a defect:
-//           the commit belongs on v1.x.
-//   - v1.x  The next-major development line. It publishes on its own "v1.x"
+//           the commit belongs on v1.
+//   - v1    The next-major development line. It publishes on its own "v1"
 //           channel, so its GitHub releases are marked pre-release and never
 //           take the "Latest" badge away from main.
 //
 // You might ask, why are we not just using release/v1.0.x instead? The reason
-// is because we might want multiple feature versions of v1.x deployed in
+// is because we might want multiple feature versions of v1 deployed in
 // various environments simultaneously, and using release/v1.0.x would tie us to a
 // single patch line, which is less flexible.
 //
@@ -21,8 +21,8 @@ const maintenanceMatch = branch.match(/^release\/v(\d+)\.(\d+)$/)
 const branches = [
   'main',
   {
-    name: 'v1.x',
-    channel: 'v1.x'
+    name: 'v1',
+    channel: 'v1'
   }
 ]
 if (maintenanceMatch) {