merge: Sync develop with master #37

Merged

eva merged 15 commits from master into develop 2026-09-02 13:41:20 -05:00

Conversation 0 Commits 15 Files Changed 7

+121 -36

eva commented 2026-09-02 13:39:47 -05:00

Owner

Copy Link

Copy Source

Summary

Dual-diverged develop vs master on SwipedModSwitcher.

	commits
develop ahead of master	1 (docs: Add CONTRIBUTING.md)
master ahead of develop	15 (CI/Go bumps already on master)

• Trees currently differ (develop stale on CI/workflows/go.mod).
• CONTRIBUTING.md content is identical on both tips.
• Trial merges both ways are clean; result tree equals master.
• No unique code on develop — only duplicate docs.

This PR syncs develop ← master (helix-proxy pattern). After merge + FF, tips should match.

Eva merging (docs-only unique on develop; CI green required). Not waiting on Ash.

## Summary Dual-diverged `develop` vs `master` on SwipedModSwitcher. | | commits | |---|---| | develop ahead of master | 1 (`docs: Add CONTRIBUTING.md`) | | master ahead of develop | 15 (CI/Go bumps already on master) | - Trees currently **differ** (develop stale on CI/workflows/go.mod). - `CONTRIBUTING.md` content is **identical** on both tips. - Trial merges both ways are **clean**; result tree equals **master**. - No unique code on develop — only duplicate docs. This PR syncs `develop` ← `master` (helix-proxy pattern). After merge + FF, tips should match. Eva merging (docs-only unique on develop; CI green required). Not waiting on Ash.

eva added 15 commits 2026-09-02 13:39:47 -05:00

Merge pull request 'Merge pull request 'update-develop' (#26) from update-develop into develop' (#27) from develop into master ... 12a9c101f2

Reviewed-on: #27

Merge pull request 'small temporary fix for release updating not working' (#28) from develop into master ... f1603dc6fa

Reviewed-on: #28

Merge pull request 'fix typo in tag-release' (#29) from develop into master ... c5f77582c0

Reviewed-on: #29

fix ci caa699c651

test d46a142312

minor cleanup of artifact names 2dbc72bd39

remove toolcache env its hardcoded in the runners config now 42af2d6d25

Update .gitea/workflows/tag-release.yaml ... 0650dabb15

re-enable release binaries

Update README.md c1885f174a

Bump Go to 1.27.0 (#30) ba986af8a8

Bump push-ci golangci-lint to v8 / v2.13.2 (#31) b898338b2d

docs: Add CONTRIBUTING.md ... 9e493e68d8

Copy the develop tip contribution guide onto the default branch
so defaults and develop share one short CONTRIBUTING.md.

docs: Add CONTRIBUTING.md ... d252e8e8d9

Add short contribution guide on the default branch from develop tip content.

ci: Bump tag-release golangci-lint to v8 5b2affec8d

ci: Bump tag-release golangci-lint to v8 ... 23287c7c6c

Align tag Lint with push-ci for Go 1.27; gate release on lint+test; gitea-release-action job token.

eva merged commit 1d12405956 into develop 2026-09-02 13:41:20 -05:00

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

Kind/Breaking

Breaking change that won't be backward compatible

Kind/Bug

Something is not working

Kind/Documentation

Documentation changes

Kind/Enhancement

Improve existing functionality

Kind/Feature

New functionality

Kind/Security

This is security issue

Kind/Testing

Issue or pull request related to testing

Priority

Critical

The priority is critical

Priority

High

The priority is high

Priority

Low

The priority is low

Priority

Medium

The priority is medium

Reviewed

Confirmed

Issue has been confirmed

Reviewed

Duplicate

This issue or pull request already exists

Reviewed

Invalid

Invalid issue

Reviewed

Won't Fix

This issue won't be fixed

Status

Abandoned

Somebody has started to work on this but abandoned work

Status

Blocked

Something is blocking this issue or pull request

Status

Need More Info

Feedback is required to reproduce issue or to continue work

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ash blake eva linus moss pike s1d3sw1ped

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: s1d3sw1ped/SwipedModSwitcher#37