Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove "next" autoupdater branch #534

Merged
merged 6 commits into from
Jan 2, 2025
Merged

remove "next" autoupdater branch #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
facc60b
site: migrate "next" to "stable" update channel
grische Jan 1, 2025
c85955f
Makefile: do not set next update channel
grische Jan 1, 2025
cbcf412
site: set "stable" as default autoupdater channel
grische Jan 1, 2025
dde296c
Revert "github: mark next releases always as pre-release"
grische Jan 1, 2025
d5280dc
Makefile: remove next branch from build
grische Jan 1, 2025
052bb96
site: remove next autoupdater branch
grische Jan 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/firmware.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ jobs:
# Note: If there is no release name specified, releases created in
# the GitHub UI do not trigger a failure and are modified instead.
draft: false
prerelease: true # "next" should always be a pre-release
prerelease: false
# Note: Release notes are only auto-generated if the release was
# created by the Github Action and was not created in the Github UI.
generate_release_notes: true
Expand Down
6 changes: 3 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ GLUON_TARGETS ?= $(shell cat targets | tr '\n' ' ')
GLUON_AUTOUPDATER_ENABLED := 1

ifneq (,$(shell git describe --exact-match --tags 2>/dev/null))
GLUON_AUTOUPDATER_BRANCH := next
GLUON_AUTOUPDATER_BRANCH := stable
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
else
GLUON_AUTOUPDATER_BRANCH := next
GLUON_AUTOUPDATER_BRANCH := experimental
EXP_FALLBACK = $(shell date '+%Y%m%d')
BUILD_NUMBER ?= exp$(EXP_FALLBACK)
GLUON_RELEASE := $(shell git describe --tags)~$(BUILD_NUMBER)
Expand Down Expand Up @@ -47,7 +47,7 @@ else # only run for specific gluon devices (works only for a single GLUON_TARGET
endif

manifest: build
for branch in next experimental testing stable; do \
for branch in experimental testing stable; do \
${GLUON_MAKE} manifest GLUON_AUTOUPDATER_BRANCH=$$branch;\
done
mv -f ${GLUON_BUILD_DIR}/output/* ./output/
Expand Down
32 changes: 4 additions & 28 deletions site.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,32 +51,8 @@

autoupdater = {
enabled = 1,
branch = 'next',
branch = 'stable',
branches = {
next = {
name = 'next',
mirrors = {
'http://firmware.ffmuc.net/next/sysupgrade',
'http://5.1.66.255/next/sysupgrade',
'http://185.150.99.255/next/sysupgrade',
'http://[2001:678:e68:f000::]/next/sysupgrade',
'http://[2001:678:ed0:f000::]/next/sysupgrade',
},
good_signatures = 1,
pubkeys = {
'6dcfc670a4150e16962c1852066669d9b337f168d0f6a863ed930968c2f047eb', -- awlnx
'dc44c9810a0470b2de63990128dbae392a836f4385d23e57eb72880ea8fbcf16', -- django
'5700c7a266d80aa1c6c33f29835a7b200bdd500e88ee86c0a63e24a0023364f6', -- krombel
'216a34d34a15688e127d8d90e6c57587aa8c682b0648322f68338487657fd5ff', -- lukesix
'2a74ed02120a7d48bb2dc9be988b3480ed99844054b3d7f3e5d3df27d19d814b', -- ole
'56c4201f6ce2994678b0142e19099dd28d6ed17775d35ca9a7f12d9235890ffc', -- chris
'3cc6dc6d0d7499d4d17cacad5f16336634e0b26700807f29cc241eaabbde481f', -- goligo
'e7a50df4bc8875113eaf75dff5204e8753a9189baeed40c6db0509398a428820', -- thegoliath
'50bafd8216cab2ee1c11c215b528dd7c6396f3edfdab689c70ca04a9f284b931', -- grische
'cc7e3a6a4788d4246075923b298634f14a4fd179020ef6369fb74d601f55cc84', -- ff_mgk
'18fecc717a237ea5702fb97fa4689f9307d0267e3ee8f09377dbed99397b77b9', -- t0biii
},
},
stable = {
name = 'stable',
mirrors = {
Expand Down Expand Up @@ -173,9 +149,9 @@
tq_limit_enabled = false, -- incompatible with Batman V. The offline SSID will only be set if there is no gateway reacheable.
},

update_channel = { -- next branch only !!!
from_name = false, -- false to catch all
to_name = 'next', -- if to_name is defined, autoupdater branch is set to it on upgrade
update_channel = {
from_name = 'next', -- false to catch all
to_name = 'stable', -- if to_name is defined, autoupdater branch is set to it on upgrade
},

custom_banner = {
Expand Down
Loading