From facc60b90c04069deafe7f83f2ee9e273ea65e22 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Wed, 1 Jan 2025 15:51:36 +0100 Subject: [PATCH 1/6] site: migrate "next" to "stable" update channel With https://github.com/freifunkMUC/ffmuc-salt-public/pull/181 merged there is no need anymore for a "next" channel. --- site.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/site.conf b/site.conf index c4e3bc9f..4cc0595b 100644 --- a/site.conf +++ b/site.conf @@ -173,9 +173,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 = { From c85955fc0a0d34f28205cf6476e44c21353e7cef Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Wed, 1 Jan 2025 15:53:27 +0100 Subject: [PATCH 2/6] Makefile: do not set next update channel --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index b8924b72..4f9ffc31 100644 --- a/Makefile +++ b/Makefile @@ -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) From cbcf412b37343ef14a30ddda6caee9a31fa7ce99 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Wed, 1 Jan 2025 15:54:14 +0100 Subject: [PATCH 3/6] site: set "stable" as default autoupdater channel --- site.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/site.conf b/site.conf index 4cc0595b..b3463d13 100644 --- a/site.conf +++ b/site.conf @@ -51,7 +51,7 @@ autoupdater = { enabled = 1, - branch = 'next', + branch = 'stable', branches = { next = { name = 'next', From dde296c9ba815fb7788da21a7e0abb941759913f Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Wed, 1 Jan 2025 15:58:14 +0100 Subject: [PATCH 4/6] Revert "github: mark next releases always as pre-release" This reverts commit e69d09eb8a3ccda09c5bbfc16e018c94c3645e8a. --- .github/workflows/firmware.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index bf0c1e60..3d5916b2 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -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 From d5280dc9d212c161a059286e2513c01137959f90 Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Wed, 1 Jan 2025 16:02:54 +0100 Subject: [PATCH 5/6] Makefile: remove next branch from build --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4f9ffc31..0e9bd1e9 100644 --- a/Makefile +++ b/Makefile @@ -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/ From 052bb96f7d247c51923c9db310cede2e6cc0d22d Mon Sep 17 00:00:00 2001 From: Grische <2787581+grische@users.noreply.github.com> Date: Thu, 2 Jan 2025 13:28:29 +0100 Subject: [PATCH 6/6] site: remove next autoupdater branch --- site.conf | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/site.conf b/site.conf index b3463d13..46b484c7 100644 --- a/site.conf +++ b/site.conf @@ -53,30 +53,6 @@ enabled = 1, 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 = {