diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index abf14543477..8dd4d892a7e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,12 +75,11 @@ jobs: sudo systemctl start mysql python3 tools/ci/generate_sql_scripts.py tools/ci/validate_sql.sh - - name: Install RUST_G + - name: Install RUST_G Deps run: | sudo dpkg --add-architecture i386 sudo apt update || true sudo apt install libssl1.1:i386 - bash tools/ci/install_rustg.sh - name: Compile & Run Unit Tests run: | tools/ci/install_byond.sh diff --git a/.gitignore b/.gitignore index fdca68f06ec..a8ccd115662 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,3 @@ stddef.dm # ignore midi2piano build cache /tools/midi2piano/midi2piano/obj/* - -# ignore RUSTG linux binary, since linux dependencies vary with pretty much every single install -librust_g.so diff --git a/_build_dependencies.sh b/_build_dependencies.sh index af8776c888c..02c0cc25e35 100644 --- a/_build_dependencies.sh +++ b/_build_dependencies.sh @@ -7,5 +7,5 @@ export NODE_VERSION=12 export BYOND_MAJOR=513 # Byond Minor export BYOND_MINOR=1526 -# For the RUSTG library +# For the RUSTG library. Not actually installed by CI but kept as a reference export RUSTG_VERSION=2.1-P diff --git a/librust_g.so b/librust_g.so new file mode 100644 index 00000000000..d5c25f422d2 Binary files /dev/null and b/librust_g.so differ diff --git a/tools/ci/install_rustg.sh b/tools/ci/install_rustg.sh index f1b77ef5baa..7c67513e64a 100755 --- a/tools/ci/install_rustg.sh +++ b/tools/ci/install_rustg.sh @@ -1,6 +1,8 @@ #!/usr/bin/env bash set -euo pipefail +# This script is not actually used by CI, but kept as a reference incase we refactor CI again + source _build_dependencies.sh mkdir -p ~/.byond/bin