Bump RustG version to 3.0.0

SierraBay · Nov 25, 2023 · 6fda9f7 · 6fda9f7
1 parent dfca1b6
commit 6fda9f7
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,7 +12,7 @@ env:
   BYOND_MINOR: "1589"
   SPACEMAN_DMM_VERSION: suite-1.7.3
   RUST_G_REPO: "ss220-space/rust-g-tg"
-  RUST_G_VERSION: "2.0.0-ss220"
+  RUST_G_VERSION: "3.0.0-ss220"
 
 jobs:
   PreFlight:
@@ -104,7 +104,6 @@ jobs:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
       - name: Install rust_g
-        if: steps.Setup-rust_g-cache.outputs.cache-hit != 'true'
         run: ./scripts/install-rust_g.sh
       - name: Run Tests
         env:
@@ -143,7 +142,6 @@ jobs:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
       - name: Install rust_g
-        if: steps.Setup-rust_g-cache.outputs.cache-hit != 'true'
         run: ./scripts/install-rust_g.sh
       - name: Run Tests
         env:
@@ -182,7 +180,6 @@ jobs:
           path: ~/.byond/bin/librust_g.so
           key: "rust_g-${{ env.RUST_G_REPO }}-${{ env.RUST_G_VERSION }}"
       - name: Install rust_g
-        if: steps.Setup-rust_g-cache.outputs.cache-hit != 'true'
         run: ./scripts/install-rust_g.sh
       - name: Run Tests
         env:

diff --git a/scripts/install-rust_g-dependencies.sh b/scripts/install-rust_g-dependencies.sh
@@ -3,8 +3,4 @@ set -euo pipefail
 
 sudo dpkg --add-architecture i386
 sudo apt update || true
-sudo apt remove -y libssl1.1:amd64 || true
 sudo apt install libgcc-s1:i386
-sudo apt install -o APT::Immediate-Configure=false libc6:i386
-wget http://ftp.de.debian.org/debian-security/pool/updates/main/o/openssl/libssl1.1_1.1.1n-0+deb10u6_i386.deb
-sudo dpkg -i libssl1.1_1.1.1n-0+deb10u6_i386.deb