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

add parker autoupdater branch + github actions on push #501

Merged
merged 3 commits into from
Oct 25, 2024
Merged

add parker autoupdater branch + github actions on push #501

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56356b4
add parker autoupdater branch
T0biii Oct 25, 2024
ab4c44e
add parker
T0biii Oct 25, 2024
cbbbd7f
run github actions on push
T0biii Oct 25, 2024
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: 0 additions & 2 deletions .github/workflows/firmware.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ name: Build ffmuc firmware
on:
workflow_dispatch:
push:
tags:
- v*
pull_request:
paths-ignore:
- '**.md'
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 := parker
GLUON_RELEASE := $(shell git describe --tags 2>/dev/null)
else
GLUON_AUTOUPDATER_BRANCH := next
GLUON_AUTOUPDATER_BRANCH := parker
EXP_FALLBACK = $(shell date '+%Y%m%d')
BUILD_NUMBER ?= $(EXP_FALLBACK)
GLUON_RELEASE := $(shell git describe --tags)~exp$(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 parker next experimental testing stable; do \
${GLUON_MAKE} manifest GLUON_AUTOUPDATER_BRANCH=$$branch;\
done
mv -f ${GLUON_BUILD_DIR}/output/* ./output/
Expand Down
26 changes: 25 additions & 1 deletion site.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,32 @@

autoupdater = {
enabled = 1,
branch = 'next',
branch = 'parker',
branches = {
parker = {
name = 'parker',
mirrors = {
'http://firmware.ffmuc.net/parker/sysupgrade',
'http://5.1.66.255/parker/sysupgrade',
'http://185.150.99.255/parker/sysupgrade',
'http://[2001:678:e68:f000::]/parker/sysupgrade',
'http://[2001:678:ed0:f000::]/parker/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
},
},
next = {
name = 'next',
mirrors = {
Expand Down
Loading