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

buildbot: new falter build script #118

Merged
merged 4 commits into from
Aug 19, 2024
Merged

buildbot: new falter build script #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3f007d8
buildbot: use the new falter build script
pktpls Jun 10, 2024
86f70df
buildbot: filtering of broken targets not needed anymore
pktpls Jul 1, 2024
e35db34
buildbot: quicker builds after git commits
pktpls Aug 19, 2024
1616e3c
buildbot: backbone variant not needed anymore
pktpls Aug 19, 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: 1 addition & 1 deletion roles/buildbot/files/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ c['schedulers'].append(AnyBranchScheduler(
change_filter=filter.ChangeFilter(
repository=config['packages_repo'].removesuffix('.git'),
branch=config['packages_branches']),
treeStableTimer=900,
treeStableTimer=60,
builderNames=["builds/packages"]))


Expand Down
22 changes: 7 additions & 15 deletions roles/buildbot/files/targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,22 +229,13 @@ def targetsFactory(f, wwwPrefix):
# 2. Remove comments and empty lines
# 3. Take everything but the first line
# 4. Print all entries into $targets one by one
# 5. Go through $targets, print only targets that aren't broken
#
# TODO: doesn't fail if targets-*.txt doesn't exist
"""\
targets=$(\
cat .buildconf/targets-%(prop:falterBranch)s.txt \
| grep -v "#" | grep . \
| cut -d" " -f2- \
| xargs -n1 echo | sort \
) ; \
for t in $targets; do \
if ! cat .buildconf/broken-%(prop:falterBranch)s.txt | grep -F "$t" >/dev/null ; \
then \
echo "$t" ; \
fi ; \
done \
cat build/targets-%(prop:falterBranch)s.txt \
| grep -v "#" | grep . \
| cut -d" " -f2- \
| xargs -n1 echo | sort \
"""
),
],
Expand Down Expand Up @@ -353,9 +344,10 @@ def targetsTargetFactory(f, wwwPrefix, wwwURL, alpineVersion):
&& git checkout %(prop:got_revision)s \
&& git submodule init \
&& git submodule update \
&& ./build_falter -p all -v %(prop:falterVersion)s -t %(prop:target)s \
&& env FALTER_VARIANT=tunneldigger build/build.sh %(prop:falterVersion)s %(prop:target)s \
&& env FALTER_VARIANT=notunnel build/build.sh %(prop:falterVersion)s %(prop:target)s \
) >&2 \
&& cd /root/falter-builter/firmwares \
&& cd /root/falter-builter/out/%(prop:falterVersion)s \
&& tar -c *' > out.tar \
""",
alpineVersion=alpineVersion,
Expand Down