diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 99dfab1bd8..266a81f869 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -935,6 +935,7 @@ jobs: rm private.pgp - name: Install dotnet-sdk system package + if: "!contains(env.TGS_DOTNET_QUALITY, 'preview')" run: | sudo apt-get update sudo apt-get install -y dotnet-sdk-${{ env.TGS_DOTNET_VERSION }}.0 diff --git a/build/package/deb/build_package.sh b/build/package/deb/build_package.sh index 2f81abb1e0..91524707e9 100755 --- a/build/package/deb/build_package.sh +++ b/build/package/deb/build_package.sh @@ -8,7 +8,16 @@ set -x dpkg --add-architecture i386 apt-get update -apt-get install -y npm dotnet-sdk-8.0 build-essential binutils lintian debhelper dh-make devscripts xmlstarlet # needs cleanup probably, SO copypasta +# This package set needs cleanup probably, StackOverflow copypasta +apt-get install -y npm \ + build-essential \ + binutils \ + lintian \ + debhelper \ + dh-make \ + devscripts \ + xmlstarlet +# dotnet-sdk-8.0 # Disabled while in preview CURRENT_COMMIT=$(git rev-parse HEAD) diff --git a/build/package/deb/debian/control b/build/package/deb/debian/control index ee30543ecf..486be1bcf2 100644 --- a/build/package/deb/debian/control +++ b/build/package/deb/debian/control @@ -5,8 +5,8 @@ Maintainer: Jordan Dominion Rules-Requires-Root: no Build-Depends: debhelper-compat (= 13), - dotnet-sdk-8.0, npm, +#dotnet-sdk-8.0, Disabled while in preview Standards-Version: 4.6.2 Homepage: https://tgstation.github.io/tgstation-server Vcs-Browser: https://github.com/tgstation/tgstation-server @@ -16,7 +16,7 @@ Package: tgstation-server Architecture: any Depends: ${misc:Depends}, - aspnetcore-runtime-8.0, +#aspnetcore-runtime-8.0, Disabled while in preview libc6-i386, libstdc++6:i386 [amd64], libstdc++6 [i386],