Merge lp:~z-man/armagetronad/0.2.9-armagetronad-sty+ct+ap-windows-ci-fix into lp:~armagetronad-ap/armagetronad/0.2.9-armagetronad-sty+ct+ap

[Manuel Moos]

[Manuel Moos (z-man)]

Fixes Windows builds over on GitLab CI.

=== modified file 'docker/scripts/fix_gits.sh'
--- docker/scripts/fix_gits.sh	2020-07-15 20:21:48 +0000
+++ docker/scripts/fix_gits.sh	2020-07-18 16:34:02 +0000
@@ -14,12 +14,12 @@
 }
 
 function fix_gits(){
-    ${wd}/ensure_gits.sh legacy_0.2.8 || return $?
+    ${wd}/ensure_gits.sh hack-0.2.8-sty+ct+ap || return $?
 
     set -x
 
     fix_git winlibs d03e20bf8973a6cbd1e0ecb47dd8333c5614b139 || return $?
-    fix_git codeblocks df79e615ab1321415a5d206c9da4a61e1b05d6b4 || return $?
+    fix_git codeblocks 2f363cec627bc40bdc358c2cc467d3384910691c || return $?
     fix_git steam-art 7b3930ab85a3dfbb1caffaa17442b670c823f314 || return $?
     fix_git pkg2appimage 678e5e14122f14a12c54847213585ea803e1f0e1 || return $?
 }

=== modified file 'docker/scripts/relevant_branches.sh'
--- docker/scripts/relevant_branches.sh	2020-07-15 20:21:35 +0000
+++ docker/scripts/relevant_branches.sh	2020-07-18 16:34:02 +0000
@@ -3,4 +3,4 @@
 # determines the relevant related branch for git submodules
 
 wdd=`dirname $0`
-MAIN_BRANCH=legacy_0.2.8
+MAIN_BRANCH=hack-0.2.8-sty+ct+ap