felixfoertsch
eb67464ca7
Keep main as an upstream mirror while storing the local .stignore behavior, GUI marker, reusable patch files, and Gitea release workflow in one replayable branch commit.
49 lines
2.3 KiB
Markdown
49 lines
2.3 KiB
Markdown
# Local Syncthing Patches
|
|
|
|
Apply the local patches manually after pulling a new upstream Syncthing release:
|
|
|
|
```bash
|
|
git apply patches/sync-stignore.patch patches/webui-build-marker.patch
|
|
go run build.go -build-out bin/syncthing-stignore build syncthing
|
|
```
|
|
|
|
The automated release flow uses:
|
|
|
|
```bash
|
|
./scripts/update-custom-release.sh
|
|
```
|
|
|
|
By default the script finds the latest stable upstream tag, creates a local
|
|
`custom/<version>-<suffix>` branch, applies all local patches, removes upstream
|
|
GitHub/Gitea workflow files from the release commit, tags
|
|
`<upstream>-stignore.6`, regenerates embedded GUI assets, runs focused tests,
|
|
and writes build artifacts to `dist/`.
|
|
|
|
Useful options:
|
|
|
|
```bash
|
|
CUSTOM_RELEASE_UPSTREAM_TAG=v2.1.0 ./scripts/update-custom-release.sh
|
|
CUSTOM_RELEASE_FORCE=1 ./scripts/update-custom-release.sh
|
|
CUSTOM_RELEASE_PATCHES="patches/sync-stignore.patch patches/webui-build-marker.patch" ./scripts/update-custom-release.sh
|
|
CUSTOM_RELEASE_PUSH=1 CUSTOM_RELEASE_REMOTE=gitea ./scripts/update-custom-release.sh
|
|
CUSTOM_RELEASE_PUSH=1 CUSTOM_RELEASE_PUSH_BRANCH=1 CUSTOM_RELEASE_REMOTE=gitea ./scripts/update-custom-release.sh
|
|
CUSTOM_RELEASE_CREATE_GITEA_RELEASE=1 CUSTOM_RELEASE_TEA_REPO=felixfoertsch/syncthing ./scripts/update-custom-release.sh
|
|
CUSTOM_RELEASE_BUILDS="darwin/amd64/zip darwin/arm64/zip linux/amd64/tar linux/arm64/tar" ./scripts/update-custom-release.sh
|
|
```
|
|
|
|
The Gitea workflow in `.gitea/workflows/custom-release.yml` runs the script when
|
|
the local patchset changes on `felix/release-automation`, on a schedule, and on
|
|
manual dispatch. The repository's `main` branch stays a clean upstream mirror.
|
|
The workflow detects the latest upstream Syncthing stable tag, exits if the
|
|
matching custom tag already exists, pushes only the `<upstream>-stignore.6` tag
|
|
by default, and publishes the Gitea release assets.
|
|
The local `custom/<version>` branch is only pushed when
|
|
`CUSTOM_RELEASE_PUSH_BRANCH=1` is set. The workflow builds macOS amd64, macOS
|
|
arm64, Linux amd64, and Linux arm64 archives.
|
|
|
|
The patch makes root-level `.stignore` sync like regular folder content while
|
|
keeping `.stfolder` and `.stversions` protected as internal Syncthing paths.
|
|
The web UI patch adds `It syncs .stignore now!` to the GUI footer so the custom
|
|
binary is visually distinguishable from upstream builds. The release test fails
|
|
if the generated GUI asset bundle does not contain that marker.
|