diff --git a/.github/workflows/ci-pipeline.yml b/.github/workflows/ci-pipeline.yml index 70c57bbd2f..62c07eddc8 100644 --- a/.github/workflows/ci-pipeline.yml +++ b/.github/workflows/ci-pipeline.yml @@ -1291,7 +1291,7 @@ jobs: run: | sudo dpkg --add-architecture i386 sudo apt-get update - sudo apt-get install -y -o APT::Immediate-Configure=0 libstdc++6:i386 libgcc-s1:i386 gnupg2 xmlstarlet libgdiplus + sudo apt-get install -y -o APT::Immediate-Configure=0 libstdc++6:i386 libgcc-s1:i386 gnupg2 - name: Import GPG Key if: (github.event_name == 'push' && contains(github.event.head_commit.message, '[TGSDeploy]') && (github.event.ref == 'refs/heads/master' || github.event.ref == 'refs/heads/dev')) @@ -1306,17 +1306,6 @@ jobs: sudo apt-get update sudo apt-get install -y dotnet-sdk-${{ env.TGS_DOTNET_VERSION }}.0 - - name: Setup dotnet - uses: actions/setup-dotnet@v4 - with: - dotnet-version: '${{ env.TGS_DOTNET_VERSION }}.0.x' - dotnet-quality: ${{ env.TGS_DOTNET_QUALITY }} - - - name: Setup Node.JS - uses: actions/setup-node@v4 - with: - node-version: ${{ env.TGS_WEBPANEL_NODE_VERSION }} - - name: Override /usr/bin/dotnet run: | DOTNET_PATH=$(which dotnet) @@ -1341,9 +1330,6 @@ jobs: - name: Grab Most Recent Changelog run: curl -L https://raw.githubusercontent.com/tgstation/tgstation-server/gh-pages/changelog.yml -o changelog.yml - - name: Enable Corepack - run: corepack enable - - name: Setup Telemetry Key File run: echo "${{ secrets.TGS_TELEMETRY_KEY }}" > ${{ env.TGS_TELEMETRY_KEY_FILE }} diff --git a/build/package/deb/build_package.sh b/build/package/deb/build_package.sh index 1a25546da8..f4c3dec3ca 100755 --- a/build/package/deb/build_package.sh +++ b/build/package/deb/build_package.sh @@ -35,6 +35,8 @@ echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.co apt-get update apt-get install nodejs dotnet-sdk-8.0 -y +corepack enable + CURRENT_COMMIT=$(git rev-parse HEAD) rm -rf packaging @@ -67,7 +69,6 @@ cp build/tgstation-server.service debian/ SIGN_COMMAND="$SCRIPT_DIR/wrap_gpg.sh" rm -f /tmp/tgs_wrap_gpg_output.log - set +e if [[ -z "$PACKAGING_KEYGRIP" ]]; then