diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 840a78ae44..f36055dab0 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -93,7 +93,10 @@ jobs: sudo dpkg --add-architecture i386 sudo apt update || true sudo apt install -o APT::Immediate-Configure=false libssl1.1:i386 - bash tools/ci/install_rust_deps.sh + bash tools/ci/install_rust_g.sh + - name: Install auxmos + run: | + bash tools/ci/install_auxmos.sh - name: Compile and run tests run: | bash tools/ci/install_byond.sh diff --git a/tools/ci/install_auxmos.sh b/tools/ci/install_auxmos.sh new file mode 100644 index 0000000000..591bcf612f --- /dev/null +++ b/tools/ci/install_auxmos.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -euo pipefail + +source dependencies.sh + +mkdir -p ~/.byond/bin +wget -O ~/.byond/bin/libauxmos.so "https://github.com/BeeStation/auxmos/releases/download/${AUXMOS_VERSION}/libauxmos.so" +chmod +x ~/.byond/bin/libauxmos.so +ldd ~/.byond/bin/libauxmos.so diff --git a/tools/ci/install_rust_deps.sh b/tools/ci/install_rust_g.sh similarity index 71% rename from tools/ci/install_rust_deps.sh rename to tools/ci/install_rust_g.sh index 5676fbdde7..2309f9d952 100644 --- a/tools/ci/install_rust_deps.sh +++ b/tools/ci/install_rust_g.sh @@ -5,6 +5,5 @@ 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 libauxmos.so "https://github.com/Putnam3145/auxmos/releases/download/$AUXMOS_VERSION/libauxmos.so" chmod +x ~/.byond/bin/librust_g.so ldd ~/.byond/bin/librust_g.so diff --git a/tools/ci/run_server.sh b/tools/ci/run_server.sh index 7011d530e2..4d943846f0 100755 --- a/tools/ci/run_server.sh +++ b/tools/ci/run_server.sh @@ -7,11 +7,6 @@ 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 ..