Skip to content

Commit 23c3a6c

Browse files
Attempt to multibuild on CI (ParadiseSS13#19571)
* Attempt to multibuild on CI * I cant space in bash * AAAAAAAAAAAAAAAAAAAAAA * Im gonna bash my head in * ..
1 parent 250dc8a commit 23c3a6c

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ jobs:
5858
strategy:
5959
matrix:
6060
maptype: ['/datum/map/cyberiad', '/datum/map/delta', '/datum/map/metastation']
61+
byondtype: ['STABLE', 'BETA']
6162
services:
6263
mariadb:
6364
image: mariadb:latest

_build_dependencies.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
export SPACEMANDMM_TAG=suite-1.7.1
44
# For TGUI
55
export NODE_VERSION=12
6-
# Byond Major
7-
export BYOND_MAJOR=514
8-
# Byond Minor
9-
export BYOND_MINOR=1566
6+
# Stable Byond Major
7+
export STABLE_BYOND_MAJOR=514
8+
# Stable Byond Minor
9+
export STABLE_BYOND_MINOR=1589
10+
# Beta Byond Major
11+
export BETA_BYOND_MAJOR=515
12+
# Beta Byond Minor
13+
export BETA_BYOND_MINOR=1593
1014
# Python version for mapmerge and other tools
1115
export PYTHON_VERSION=3.7.9

tools/ci/install_byond.sh

+16-4
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,33 @@
11
#!/bin/bash
2-
set -euo pipefail
2+
set -eo pipefail
33

44
source _build_dependencies.sh
55

6-
if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${BYOND_MAJOR}.${BYOND_MINOR}" $HOME/BYOND/version.txt;
6+
TARGET_MAJOR=$STABLE_BYOND_MAJOR
7+
TARGET_MINOR=$STABLE_BYOND_MINOR
8+
9+
if [ -z "$1" ]; then
10+
echo "No arg specified. Assuming STABLE."
11+
else
12+
if [ "$1" == "BETA" ]; then
13+
TARGET_MAJOR=$BETA_BYOND_MAJOR
14+
TARGET_MINOR=$BETA_BYOND_MINOR
15+
fi
16+
fi
17+
18+
if [ -d "$HOME/BYOND/byond/bin" ] && grep -Fxq "${TARGET_MAJOR}.${TARGET_MINOR}" $HOME/BYOND/version.txt;
719
then
820
echo "Using cached directory."
921
else
1022
echo "Setting up BYOND."
1123
rm -rf "$HOME/BYOND"
1224
mkdir -p "$HOME/BYOND"
1325
cd "$HOME/BYOND"
14-
curl "http://www.byond.com/download/build/${BYOND_MAJOR}/${BYOND_MAJOR}.${BYOND_MINOR}_byond_linux.zip" -o byond.zip
26+
curl "http://www.byond.com/download/build/${TARGET_MAJOR}/${TARGET_MAJOR}.${TARGET_MINOR}_byond_linux.zip" -o byond.zip
1527
unzip byond.zip
1628
rm byond.zip
1729
cd byond
1830
make here
19-
echo "$BYOND_MAJOR.$BYOND_MINOR" > "$HOME/BYOND/version.txt"
31+
echo "$TARGET_MAJOR.$TARGET_MINOR" > "$HOME/BYOND/version.txt"
2032
cd ~/
2133
fi

0 commit comments

Comments
 (0)