From 330d928820dba143fdb86f4502b2916a6dec3f7d Mon Sep 17 00:00:00 2001
From: Andrew Shu <talklittle@gmail.com>
Date: Tue, 8 Jul 2025 06:19:38 -0700
Subject: [PATCH] Begin versioning Git branches, set version 1.100.0

* Set tildes version to 1.100.0 in package.json.
  This is an arbitrary version number to reflect the
  beginning of our new git branch versioning setup.

* Update GitLab CI to run on staging-* and develop-* versioned branches

* Update CONTRIBUTING.md to reflect versioned Git branch setup
---
 .gitlab-ci.yml      |  8 ++++----
 CONTRIBUTING.md     | 36 ++++++++++++++++++++++++++++++++++++
 tildes/package.json |  2 +-
 3 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c677a35..5abdb56 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,13 +3,13 @@ workflow:
     - if: $CI_PIPELINE_SOURCE == 'merge_request_event'
     - if: $CI_COMMIT_TAG
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-    - if: $CI_COMMIT_BRANCH == 'staging'
-    - if: $CI_COMMIT_BRANCH == 'develop'
+    - if: $CI_COMMIT_BRANCH =~ /^staging-/
+    - if: $CI_COMMIT_BRANCH =~ /^develop-/
 
 default:
-  image: docker:27.4.1
+  image: docker:28.3.1
   services:
-    - docker:27.4.1-dind
+    - docker:28.3.1-dind
 
 build:
   stage: build
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7eaf501..d51ac4b 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -44,6 +44,14 @@ If you look at [the list of issues](https://gitlab.com/tildes/tildes/issues), th
 
 Once you've selected an issue to work on, please leave a comment saying so. This will allow other people to see that they shouldn't also start on that issue.
 
+### Git branches
+
+<small>*Updated in July 2025*</small>
+
+Contributions should be made on top of the latest `develop-<version>` Git branch. For example, if you see `develop-1.101` and `develop-1.102`, and nothing later than that, then create your feature branch off of `develop-1.102`. When submitting the merge request, please ensure it is targeting that branch also.
+
+Please avoid submitting merge requests directly to `master`. Our `develop-<version>` and `staging-<version>` branches are set up to streamline code reviews and testing before merging to `master`. The `master` branch generally reflects what is running live on the main site.
+
 ### Before submitting a merge request
 
 After you've finished making your changes, there are a few things to check before proposing your changes as a merge request.
@@ -57,3 +65,31 @@ Squash your changes into logical commits. For many changes there should only be
 Once your code is ready, you can [submit a new merge request on GitLab](https://gitlab.com/tildes/tildes/merge_requests/new).
 
 After creating the merge request, if you need to make any further changes to your code (whether in response to code review or not), please add the changes as new commits. Do not modify the existing commits, this makes it far simpler for other people to follow what changes you're making. Once the merge request is approved, a final pass can be done to squash the commits down, make updates to commit messages, etc. before it's actually merged.
+
+
+# Notes for Maintainers
+
+This section contains notes for Tildes code repository maintainers. If you are a code contributor, **you can safely ignore this entire section**.
+
+## [For Maintainers] Cutting new versions
+
+1. Merge/cherry-pick changes to `master`. Generally coming from latest `staging-<version>` branch.
+2. Bump the `tildes/package.json` version on `master`. E.g. to `"1.101.0"`.
+3. Add a Git tag on the commit that bumped the `package.json` version:
+
+```sh
+$ git tag -a -m'Automatically insert meme GIF links every other post' v1.101.0
+```
+
+4. Create new `staging-<version>` and `develop-<version>` branches for the **next** version:
+
+```sh
+$ git branch -c master staging-1.102
+$ git branch -c master develop-1.102
+```
+
+5. Push the new tag and branches to the main Tildes repo (assuming Git remote named `upstream`):
+
+```sh
+$ git push --follow-tags upstream master staging-1.102 develop-1.102
+```
\ No newline at end of file
diff --git a/tildes/package.json b/tildes/package.json
index d311fcc..ab8ae6b 100644
--- a/tildes/package.json
+++ b/tildes/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tildes",
-  "version": "1.0.0",
+  "version": "1.100.0",
   "description": "Tildes (tildes.net) - a non-profit community site",
   "license": "AGPL-3.0-or-later",
   "scripts": {