diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 6046a65d0b..dd97869858 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -115,6 +115,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v1 + + - name: Upgrade NPM + run: sudo npm install -g npm - name: Build Docker Image run: docker build . -f build/Dockerfile @@ -126,11 +129,6 @@ jobs: configuration: [ 'Debug', 'Release' ] runs-on: ubuntu-latest steps: - - name: Install Node 12.X - uses: actions/setup-node@v1 - with: - node-version: 12.x - - name: Setup dotnet uses: actions/setup-dotnet@v1 with: @@ -138,6 +136,9 @@ jobs: - name: Checkout uses: actions/checkout@v1 + + - name: Upgrade NPM + run: sudo npm install -g npm - name: Build run: dotnet build -c ${{ matrix.configuration }}NoService @@ -165,6 +166,9 @@ jobs: - name: Checkout uses: actions/checkout@v1 + + - name: Upgrade NPM + run: npm install -g npm - name: Clean package cache as a temporary workaround for actions/setup-dotnet#155 run: dotnet clean && dotnet nuget locals all --clear @@ -197,6 +201,9 @@ jobs: uses: actions/setup-dotnet@v1 with: dotnet-version: ${{ env.TGS_DOTNET_VERSION }} + + - name: Upgrade NPM + run: npm install -g npm - name: Set General__UseBasicWatchdog if: ${{ matrix.watchdog-type == 'Basic' }} @@ -321,6 +328,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12.x + + - name: Upgrade NPM + run: npm install -g npm - name: Setup dotnet uses: actions/setup-dotnet@v1 diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 9c2ef53894..bb0e8e8c63 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -21,6 +21,9 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12.x + + - name: Upgrade NPM + run: npm install -g npm - name: Checkout repository uses: actions/checkout@v2 diff --git a/build/ControlPanelVersion.props b/build/ControlPanelVersion.props index b5d79ca612..ee18d7302c 100644 --- a/build/ControlPanelVersion.props +++ b/build/ControlPanelVersion.props @@ -1,6 +1,6 @@ - 2.3.0 + 2.4.0 diff --git a/build/Dockerfile b/build/Dockerfile index 507d8339c6..fb870efdfb 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -4,8 +4,11 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build # replace shell with bash so we can source files RUN curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.2/install.sh | sh -ENV NODE_VERSION 10.13.0 +ENV NODE_VERSION 14.18.1 + ENV NVM_DIR /root/.nvm +ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules +ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH RUN . $NVM_DIR/nvm.sh \ && nvm install $NODE_VERSION \ @@ -13,10 +16,8 @@ RUN . $NVM_DIR/nvm.sh \ && apt-get update \ && apt-get install -y \ dos2unix \ - && rm -rf /var/lib/apt/lists/* - -ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules -ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH + && rm -rf /var/lib/apt/lists/* \ + && npm install -g npm # Build web control panel WORKDIR /repo/build diff --git a/build/Version.props b/build/Version.props index 53e063bb88..7c296967f1 100644 --- a/build/Version.props +++ b/build/Version.props @@ -3,7 +3,7 @@ - 4.15.5 + 4.15.6 4.0.0 9.3.0 9.3.1 diff --git a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj index 3d7385b40f..4262179a12 100644 --- a/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj +++ b/src/Tgstation.Server.Host/Tgstation.Server.Host.csproj @@ -1,4 +1,4 @@ - + @@ -68,7 +68,7 @@ - +