From a3ee081e9976e37d89525b85e3224f563068a1cd Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Thu, 9 Jan 2025 23:23:05 +0100 Subject: [PATCH] Refactor opendream run and pin dotnet for it (#20345) No player visible changes --- .github/workflows/byond.yml | 18 ++++++++++++++---- tools/ci/install_od.sh | 10 ---------- tools/ci/run_od.sh | 3 --- 3 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 tools/ci/install_od.sh delete mode 100755 tools/ci/run_od.sh diff --git a/.github/workflows/byond.yml b/.github/workflows/byond.yml index c9d8d9e64f8..fde0bb38ec8 100644 --- a/.github/workflows/byond.yml +++ b/.github/workflows/byond.yml @@ -195,13 +195,23 @@ jobs: - name: Set ENV variables run: bash dependencies.sh - - name: Download OpenDream Compiler - run: | - bash tools/ci/install_od.sh + #Setup the .NET dependency to what is needed by OpenDream + - name: Setup DotNet Dependency + uses: actions/setup-dotnet@v4 + with: + dotnet-version: 9.0.100 + #Prepare the precompiled OpenDream compiler + - name: Prepare OpenDream Compiler + run: | + cd $HOME + wget -v https://github.com/OpenDreamProject/OpenDream/releases/download/latest/DMCompiler_linux-x64.tar.gz + tar -xf DMCompiler_linux-x64.tar.gz + + #Run OpenDream on the DME - name: Run OpenDream run: | - tools/ci/run_od.sh + dotnet $HOME/DMCompiler_linux-x64/DMCompiler.dll --suppress-unimplemented aurorastation.dme ########################################### ############### TGUI LINTING ############## diff --git a/tools/ci/install_od.sh b/tools/ci/install_od.sh deleted file mode 100644 index be500496bd1..00000000000 --- a/tools/ci/install_od.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -set -eo pipefail - -echo "Download OpenDream Compiler." - -cd $HOME - -wget -v https://github.com/OpenDreamProject/OpenDream/releases/download/latest/DMCompiler_linux-x64.tar.gz - -tar -xf DMCompiler_linux-x64.tar.gz diff --git a/tools/ci/run_od.sh b/tools/ci/run_od.sh deleted file mode 100755 index 713706242e6..00000000000 --- a/tools/ci/run_od.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -eo pipefail -dotnet $HOME/DMCompiler_linux-x64/DMCompiler.dll --suppress-unimplemented aurorastation.dme