Skip to content

Commit a09b0e2

Browse files
authored
Merge pull request #55 from nm-packages/codex/update-main-branch-workflow
Update branch workflow to main
2 parents d6ce951 + e232b44 commit a09b0e2

5 files changed

Lines changed: 10 additions & 40 deletions

File tree

.github/workflows/test.yml

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,42 +3,14 @@ name: Tests
33
on:
44
pull_request:
55
branches:
6-
- release
76
- main
87

98
concurrency:
109
group: ${{ github.workflow }}-${{ github.ref }}
1110
cancel-in-progress: true
1211

1312
jobs:
14-
test-sqlite-release:
15-
if: github.base_ref == 'release'
16-
runs-on: ubuntu-latest
17-
strategy:
18-
matrix:
19-
include:
20-
- python: "3.10"
21-
toxenv: py310-django42-wagtail63-sqlite
22-
- python: "3.14"
23-
toxenv: py314-django60-wagtail73-sqlite
24-
25-
steps:
26-
- name: Checkout repository
27-
uses: actions/checkout@v3
28-
29-
- name: Set up uv
30-
id: setup-uv
31-
uses: astral-sh/setup-uv@v8.1.0
32-
with:
33-
python-version: ${{ matrix.python }}
34-
enable-cache: true
35-
36-
- name: Test with tox
37-
id: test-with-tox
38-
run: uvx --with tox-gh-actions tox -e ${{ matrix.toxenv }}
39-
40-
test-sqlite-main:
41-
if: github.base_ref == 'main'
13+
test-sqlite:
4214
runs-on: ubuntu-latest
4315
strategy:
4416
matrix:
@@ -63,7 +35,6 @@ jobs:
6335
DATABASE: ${{ matrix.database }}
6436

6537
test-postgres:
66-
if: github.base_ref == 'main'
6738
runs-on: ubuntu-latest
6839
strategy:
6940
matrix:
@@ -103,9 +74,7 @@ jobs:
10374
DB_PORT: 5432
10475
DATABASE: ${{ matrix.database }}
10576

106-
10777
test-mysql:
108-
if: github.base_ref == 'main'
10978
runs-on: ubuntu-latest
11079
strategy:
11180
matrix:

AGENTS.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,11 @@ This file guides coding agents working in this repository. Keep it operational a
6868

6969
## Branch Workflow
7070

71-
- Treat `release` as the repository default branch.
72-
- Start all new work from `release`; it tracks the latest changes that are not yet released to PyPI.
73-
- Before making repo-tracked changes, create and switch to a new branch from `release`.
74-
- Do not make routine feature, fix, or documentation changes directly on `release` or `main` unless the task explicitly requires it.
75-
- Treat `main` as the release-preparation branch, not the starting point for routine feature or fix work.
76-
- Target routine merge requests at `release`; follow `docs/contributing/releasing.md` for release-prep work that lands on `main`.
71+
- Treat `main` as the repository default branch, pull request target, and release/tagging branch.
72+
- Start all new work from `main`.
73+
- Before making repo-tracked changes, create and switch to a new branch from `main`.
74+
- Do not make routine feature, fix, or documentation changes directly on `main` unless the task explicitly requires it.
75+
- Target routine pull requests at `main`.
7776

7877
## Change Boundaries
7978

CHANGELOG

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
44

55
## Unreleased
66

7+
- Update contributor branch workflow guidance and PR CI to target `main`.
8+
79
## [1.3.0] - 2026-04-21
810

911
- Add Wagtail 7.3 testing coverage and Django 6.0 coverage for that compatibility line

docs/contributing/releasing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ The GitHub repository and workflow identity must match exactly, or publish will
4545
For local sandbox/test command workflows before a release, use:
4646

4747
- [developer.md](../developer.md) for canonical developer workflow and quickstart commands
48-
- [AGENTS.md](https://github.com/nm-packages/wagtail-honeypot/blob/release/AGENTS.md) for canonical contributor command/reference guidance
48+
- [AGENTS.md](https://github.com/nm-packages/wagtail-honeypot/blob/main/AGENTS.md) for canonical contributor command/reference guidance
4949

5050
## Changelog Maintenance
5151

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ dev = [
4747
[project.urls]
4848
Repository = "https://github.com/wagtail-packages/wagtail-honeypot"
4949
Issues = "https://github.com/wagtail-packages/wagtail-honeypot/issues"
50-
Changelog = "https://github.com/wagtail-packages/wagtail-honeypot/blob/release/CHANGELOG"
50+
Changelog = "https://github.com/wagtail-packages/wagtail-honeypot/blob/main/CHANGELOG"
5151

5252
[tool.uv]
5353
default-groups = ["dev"]

0 commit comments

Comments
 (0)