From c78a7af84872bc661a9fcc7e0ce6c051fb6595ac Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 25 Jul 2021 17:01:36 -0700 Subject: [PATCH] byond version, also more like this --- dependencies.sh | 4 ++-- tools/ci/install_rust_deps.sh | 4 +--- tools/ci/run_server.sh | 5 +++++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dependencies.sh b/dependencies.sh index fc6b1f847a..d7b56ae5b9 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -4,8 +4,8 @@ #Final authority on what's required to fully build the project # byond version -export BYOND_MAJOR=513 -export BYOND_MINOR=1536 +export BYOND_MAJOR=514 +export BYOND_MINOR=1556 #rust_g git tag export RUST_G_VERSION=0.4.8 diff --git a/tools/ci/install_rust_deps.sh b/tools/ci/install_rust_deps.sh index 92f3709fc8..5676fbdde7 100644 --- a/tools/ci/install_rust_deps.sh +++ b/tools/ci/install_rust_deps.sh @@ -5,8 +5,6 @@ source dependencies.sh mkdir -p ~/.byond/bin wget -O ~/.byond/bin/librust_g.so "https://github.com/tgstation/rust-g/releases/download/$RUST_G_VERSION/librust_g.so" -wget -O ~/.byond/bin/libauxmos.so "https://github.com/Putnam3145/auxmos/releases/download/$AUXMOS_VERSION/libauxmos.so" +wget -O libauxmos.so "https://github.com/Putnam3145/auxmos/releases/download/$AUXMOS_VERSION/libauxmos.so" chmod +x ~/.byond/bin/librust_g.so -chmod +x ~/.byond/bin/libauxmos.so ldd ~/.byond/bin/librust_g.so -ldd ~/.byond/bin/libauxmos.so diff --git a/tools/ci/run_server.sh b/tools/ci/run_server.sh index 4d943846f0..7011d530e2 100755 --- a/tools/ci/run_server.sh +++ b/tools/ci/run_server.sh @@ -7,6 +7,11 @@ mkdir ci_test/config #test config cp tools/ci/ci_config.txt ci_test/config/config.txt +#throw auxmos into ldd +cp libauxmos.so ~/.byond/bin/libauxmos.so +chmod +x ~/.byond/bin/libauxmos.so +ldd ~/.byond/bin/libauxmos.so + cd ci_test DreamDaemon tgstation.dmb -close -trusted -verbose -params "log-directory=ci" cd ..