More stuff

shiptest-ss13 · Dec 8, 2023 · 0b1ee25 · 0b1ee25
1 parent 8b9cc29
commit 0b1ee25
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 19 deletions.
diff --git a/.github/workflows/autowiki.yml b/.github/workflows/autowiki.yml
@@ -19,32 +19,59 @@ jobs:
         unset SECRET_EXISTS
         if [ -n "$ENABLER_SECRET" ]; then SECRET_EXISTS=true ; fi
         echo "SECRETS_ENABLED=$SECRET_EXISTS" >> $GITHUB_OUTPUT
+
     - name: Checkout
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       uses: actions/checkout@v3
-    - name: Restore BYOND cache
+
+    - name: Setup BYOND cache
+      id: cache-byond
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       uses: actions/cache@v3
       with:
         path: ~/BYOND
-        key: ${{ runner.os }}-byond-${{ secrets.CACHE_PURGE_KEY }}
-    - name: Install rust-g
+        key: ${{ runner.os }}-byond-cache-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('dependencies.sh') }}
+
+    - name: Install BYOND
+      if: steps.cache-byond.outputs.cache-hit != 'true' && steps.secrets_set.outputs.SECRETS_ENABLED
+      run: bash tools/ci/install_byond.sh
+
+    - name: Install runtime dependencies
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       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
-    - name: Install auxmos
+        sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
+
+    - name: Setup dependencies cache
+      id: cache-deps
       if: steps.secrets_set.outputs.SECRETS_ENABLED
+      uses: actions/cache@v3
+      with:
+        path: ~/.byond/bin
+        key: ${{ runner.os }}-deps-cache-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('dependencies.sh') }}
+
+    - name: Install build dependencies
+      if: steps.cache-deps.outputs.cache-hit != 'true' && steps.secrets_set.outputs.SECRETS_ENABLED
       run: |
-        bash tools/ci/install_auxmos.sh
+        sudo apt install -o APT::Immediate-Configure=false libgcc-s1:i386 g++-multilib zlib1g-dev:i386
+        rustup target add i686-unknown-linux-gnu
+
+    - name: Build auxmos
+      if: steps.cache-deps.outputs.cache-hit != 'true' && steps.secrets_set.outputs.SECRETS_ENABLED
+      run: bash tools/ci/build_auxmos.sh
+
+    - name: Build rust-g
+      if: steps.cache-deps.outputs.cache-hit != 'true' && steps.secrets_set.outputs.SECRETS_ENABLED
+      run: bash tools/ci/build_rust_g.sh
+
     - name: Compile and generate Autowiki files
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       run: |
         bash tools/ci/install_byond.sh
         source $HOME/BYOND/byond/bin/byondsetup
         tools/build/build --ci autowiki
+
     - name: Run Autowiki
       if: steps.secrets_set.outputs.SECRETS_ENABLED
       env:

diff --git a/.github/workflows/run_integration_tests.yml b/.github/workflows/run_integration_tests.yml
@@ -35,27 +35,32 @@ jobs:
         if: steps.cache-byond.outputs.cache-hit != 'true'
         run: bash tools/ci/install_byond.sh
 
+      - name: Install runtime dependencies
+        run: |
+          sudo dpkg --add-architecture i386
+          sudo apt update || true
+          sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386
+
       - name: Setup dependencies cache
         id: cache-deps
         uses: actions/cache@v3
         with:
           path: ~/.byond/bin
           key: ${{ runner.os }}-deps-cache-${{ secrets.CACHE_PURGE_KEY }}-${{ hashFiles('dependencies.sh') }}
 
-      - name: Build auxmos
+      - name: Install build dependencies
         if: steps.cache-deps.outputs.cache-hit != 'true'
         run: |
-          sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false g++-multilib
-          bash tools/ci/build_auxmos.sh
+          sudo apt install -o APT::Immediate-Configure=false libgcc-s1:i386 g++-multilib zlib1g-dev:i386
+          rustup target add i686-unknown-linux-gnu
+
+      - name: Build auxmos
+        if: steps.cache-deps.outputs.cache-hit != 'true'
+        run: bash tools/ci/build_auxmos.sh
 
       - name: Build rust-g
         if: steps.cache-deps.outputs.cache-hit != 'true'
-        run: |
-          sudo dpkg --add-architecture i386
-          sudo apt update || true
-          sudo apt install -o APT::Immediate-Configure=false libssl-dev:i386 libgcc-s1:i386 g++-multilib zlib1g-dev:i386
-          bash tools/ci/build_rust_g.sh
+        run: bash tools/ci/build_rust_g.sh
 
       - name: Setup database
         run: |

diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -538,12 +538,12 @@
 	if(abs(G.get_moles(GAS_PLASMA) - 458.241) > 0.5)
 		var/plas = G.get_moles(GAS_PLASMA)
 		return list("success" = FALSE, "message" = "Fusion is not calculating plasma correctly, should be 458.241, is instead [plas]")
-	if(abs(G.get_moles(GAS_CO2) - 411.096) > 0.5)
+	if(abs(G.get_moles(GAS_CO2) - 505.078) > 0.5)
 		var/co2 = G.get_moles(GAS_CO2)
 		return list("success" = FALSE, "message" = "Fusion is not calculating co2 correctly, should be 505.078, is instead [co2]")
-	if(abs(G.return_temperature() - 78222) > 200) // I'm not calculating this at all just putting in the values I get when I do it now
+	if(abs(G.return_temperature() - 27600) > 200) // I'm not calculating this at all just putting in the values I get when I do it now
 		var/temp = G.return_temperature()
-		return list("success" = FALSE, "message" = "Fusion is not calculating temperature correctly, should be around 112232, is instead [temp]")
+		return list("success" = FALSE, "message" = "Fusion is not calculating temperature correctly, should be around 27600, is instead [temp]")
 	return ..()
 
 /datum/gas_reaction/nitrousformation //formationn of n2o, esothermic, requires bz as catalyst