RepoMirrors/xonotic
1
0
Fork 0
mirror of https://gitlab.com/xonotic/xonotic synced 2025-03-04 18:37:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

selfbuildagain branch is merged, no longer need to merge in the build script.

Browse Source
This commit is contained in:
Rudolf Polzer 2021-11-12 12:54:45 -08:00
parent d38ad04459
commit b38e0d693f
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
misc/infrastructure/xonotic-release-build.cron
View File

@ -68,11 +68,11 @@ cd ~/xonotic-release-build
# winners in the poll for upcoming CTF maps
# maps near completion
for b in \
origin/divVerent/selfbuildagain \
; do
b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
done
#for b in \
# origin/divVerent/selfbuildagain \
#; do
# b=$b ./all each sh -c 'if git rev-parse $b >/dev/null 2>&1; then git merge $b; fi'
#done
./all update -N
d0=`date +%Y%m%d`
d=$d0