Skip to content

Fix stable branch references after migration to main - #605

Closed
maghuro wants to merge 1 commit into
ExtremeFiretop:devfrom
maghuro:fix/stable-main-branch
Closed

maghuro wants to merge 1 commit into
ExtremeFiretop:devfrom
maghuro:fix/stable-main-branch

Conversation

@maghuro

@maghuro maghuro commented Sep 23, 2026

Copy link
Copy Markdown
Contributor

Summary

MerlinAU's stable branch is main, but several production/stable references still point to the removed master branch.

This PR updates only MerlinAU-owned stable branch references:

  • production branch detection in MerlinAU.sh
  • stable command target
  • stable/development display checks
  • manual installation URL in README.md
  • release workflow branch rewrite and commit message

The GNUton firmware URL in gnuton_webs_update.sh is intentionally left unchanged because it refers to a different upstream repository whose branch is still master.

Why

https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router/master/MerlinAU.sh currently returns 404 because this repository uses main and dev, not master.

The stale branch name also affects switching back to the stable release and the release workflow.

Validation

  • Based on the current upstream dev.
  • No MerlinAU-owned master references remain in MerlinAU.sh, README.md, or .github/workflows/Create-NewReleases.yml.
  • The GNUton master URL remains unchanged.
  • No firmware-download or flashing logic is modified.

@ExtremeFiretop

Copy link
Copy Markdown
Owner

The following URL:

https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router/master/MerlinAU.sh

Does not return 404 and works as expected:
image

I think this puts the entire "Why" question of your PR on thin ice:

Why

https://raw.githubusercontent.com/ExtremeFiretop/MerlinAutoUpdate-Router/master/MerlinAU.sh currently returns 404 because this repository uses main and dev, not master.

The stale branch name also affects switching back to the stable release and the release workflow.

The important context is that SCRIPT_BRANCH="master" is intentional semantics, not simply "the name of the GitHub default branch."

Every release the Github workflow sets the SCRIPT_BRANCH to "MASTER" as found here:

SCRIPT_BRANCH="master"

And all downflow logic works as expected.
So the question remains, why change it to "main" when internal semantics already expect "master" and master does not 404 as you suggest? What are we trying to fix or solve?

@ExtremeFiretop

Copy link
Copy Markdown
Owner

For this PR.
I think this is likely maybe just some confusion on how the script branches work within the script.

If you can find evidence of this 404 your talking about, we can reconsider it :)
For now I will close this and move on to the next PR.

@maghuro

maghuro commented Sep 24, 2026

Copy link
Copy Markdown
Contributor Author

You're right... I rechecked this and my premise was incorrect.
I treated `master` as a stale branch reference based on the repository's visible main/dev layout, but GitHub redirects the legacy `master` ref correctly and, more importantly, MerlinAU intentionally uses `SCRIPT_BRANCH="master"` as part of its release semantics.
Thanks for pointing that out. Closing this PR was the correct call.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants