Skip to content

Commit 6acac8d

Browse files
committed
chore: point release process to main
1 parent 4efdd14 commit 6acac8d

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

‎docs/RELEASING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
`VERSION` is this fork's release number. The supported game version is 1.2.0.
44

5-
Every push to `master`, pull request, or manual run of the [build workflow](../.github/workflows/build.yml) builds both .NET Framework 4.7.2 projects on Windows. Its `fe3h-editor-windows` artifact contains a standalone save editor executable, a ZIP with both tools and their config files, and SHA-256 checksums. Artifacts are retained for 14 days.
5+
Every push to `main`, pull request, or manual run of the [build workflow](../.github/workflows/build.yml) builds the new GUI and CLI for Windows, macOS, and Linux, plus the legacy .NET Framework 4.7.2 projects on Windows. The `feth-gui-*` and `feth-cli-*` artifacts contain standalone builds. The `fe3h-editor-windows` artifact contains the original save editor, a ZIP with both legacy tools and their config files, and SHA-256 checksums. Artifacts are retained for 14 days.
66

77
To publish after reviewing a successful Windows build:
88

9-
1. Update `VERSION` in a Conventional Commit and push `master`.
9+
1. Update `VERSION` in a Conventional Commit and push `main`.
1010
2. Wait for the build workflow to pass for that commit.
1111
3. Run `python3 tools/release.py --current --check` to check readiness.
1212
4. Run `python3 tools/release.py --current` to create and push an annotated version tag.

‎tools/release.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python3
2-
"""Tag a reviewed master commit; GitHub Actions builds and publishes it."""
2+
"""Tag a reviewed main commit; GitHub Actions builds and publishes it."""
33

44
from __future__ import annotations
55

@@ -19,15 +19,15 @@ def run(*args: str) -> str:
1919
def check_ready(tag: str) -> None:
2020
if Path(run("git", "rev-parse", "--show-toplevel")) != ROOT:
2121
raise ValueError("run from this repository")
22-
if run("git", "branch", "--show-current") != "master":
23-
raise ValueError("releases must come from master")
22+
if run("git", "branch", "--show-current") != "main":
23+
raise ValueError("releases must come from main")
2424
if run("git", "status", "--porcelain"):
2525
raise ValueError("commit working-tree changes first")
2626

27-
run("git", "fetch", "origin", "master", "--tags")
27+
run("git", "fetch", "origin", "main", "--tags")
2828
head = run("git", "rev-parse", "HEAD")
29-
if head != run("git", "rev-parse", "origin/master"):
30-
raise ValueError("local master is not synchronized with origin/master")
29+
if head != run("git", "rev-parse", "origin/main"):
30+
raise ValueError("local main is not synchronized with origin/main")
3131
if run("git", "tag", "--list", tag):
3232
raise ValueError(f"tag already exists: {tag}")
3333

@@ -36,7 +36,7 @@ def check_ready(tag: str) -> None:
3636
"--json", "conclusion,status", "--limit", "20",
3737
))
3838
if not any(build["status"] == "completed" and build["conclusion"] == "success" for build in builds):
39-
raise ValueError("wait for a successful Windows build of this commit before releasing")
39+
raise ValueError("wait for a successful build of this commit before releasing")
4040

4141

4242
def main() -> None:

0 commit comments

Comments
 (0)