From 1266d59f68c94b3314c3a557b241a9133e22f43a Mon Sep 17 00:00:00 2001 From: Putnam3145 Date: Sun, 25 Jul 2021 16:49:12 -0700 Subject: [PATCH] more possible dependency reqs (?) --- .github/workflows/ci_suite.yml | 4 ++-- dependencies.sh | 2 +- tools/ci/{install_rust_g.sh => install_rust_deps.sh} | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) rename tools/ci/{install_rust_g.sh => install_rust_deps.sh} (59%) mode change 100755 => 100644 diff --git a/.github/workflows/ci_suite.yml b/.github/workflows/ci_suite.yml index 7ed9c69a0e..264e306d44 100644 --- a/.github/workflows/ci_suite.yml +++ b/.github/workflows/ci_suite.yml @@ -88,12 +88,12 @@ jobs: mysql -u root -proot tg_ci < SQL/tgstation_schema.sql mysql -u root -proot -e 'CREATE DATABASE tg_ci_prefixed;' mysql -u root -proot tg_ci_prefixed < SQL/tgstation_schema_prefixed.sql - - name: Install rust-g + - name: Install rust dependencies run: | 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_g.sh + bash tools/ci/install_rust_deps.sh - name: Compile and run tests run: | bash tools/ci/install_byond.sh diff --git a/dependencies.sh b/dependencies.sh index 78f41e2dda..fc6b1f847a 100644 --- a/dependencies.sh +++ b/dependencies.sh @@ -11,7 +11,7 @@ export BYOND_MINOR=1536 export RUST_G_VERSION=0.4.8 #auxmos git tag -export AUXMOS_VERSION=v0.2.1 +export AUXMOS_VERSION=v0.2.2 #node version export NODE_VERSION=12 diff --git a/tools/ci/install_rust_g.sh b/tools/ci/install_rust_deps.sh old mode 100755 new mode 100644 similarity index 59% rename from tools/ci/install_rust_g.sh rename to tools/ci/install_rust_deps.sh index 2309f9d952..92f3709fc8 --- a/tools/ci/install_rust_g.sh +++ b/tools/ci/install_rust_deps.sh @@ -5,5 +5,8 @@ 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" chmod +x ~/.byond/bin/librust_g.so +chmod +x ~/.byond/bin/libauxmos.so ldd ~/.byond/bin/librust_g.so +ldd ~/.byond/bin/libauxmos.so