From 9be8f7e53c498fd1cf43fb230c23e06d7eeff25b Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 18 Oct 2021 14:12:21 -0400 Subject: [PATCH 01/11] Servicing update for LibGit2Sharp --- src/Tgstation.Server.Host/Tgstation.Server.Host.csproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 @@ - + From 5ea9617b7045fa10bf927f02be61bf6fa858b2a3 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Mon, 18 Oct 2021 14:12:43 -0400 Subject: [PATCH 02/11] Version bump to 4.15.6 --- build/Version.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ff83381b657a9636692d4c6a6e7b82e361ba1522 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 20:21:06 -0400 Subject: [PATCH 03/11] Update ControlPanelVersion.props --- build/ControlPanelVersion.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 418a67bc15e7b125dd474cfd8e50d2b5c7d81b3f Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:01:34 -0400 Subject: [PATCH 04/11] Upgrade npm pt 1 --- .github/workflows/codeql-analysis.yml | 3 +++ 1 file changed, 3 insertions(+) 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 From a72c0f2f3920fae1be5d3945e6832bfbe0aacf0b Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:04:04 -0400 Subject: [PATCH 05/11] upgrade npm pt 2 --- .github/workflows/ci-suite.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 6046a65d0b..fb848f92c6 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: npm install -g npm - name: Build Docker Image run: docker build . -f build/Dockerfile @@ -130,6 +133,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 @@ -165,6 +171,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 +206,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 +333,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 From 98bb86c2f5dce1fc2aac4673b79e03217f755331 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:08:59 -0400 Subject: [PATCH 06/11] sudo make me a sandwich --- .github/workflows/ci-suite.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index fb848f92c6..d50673c9e0 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -135,7 +135,7 @@ jobs: node-version: 12.x - name: Upgrade NPM - run: npm install -g npm + run: sudo npm install -g npm - name: Setup dotnet uses: actions/setup-dotnet@v1 From 10f6865c5ce573c0666195d9de60254aa38dcd64 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:14:07 -0400 Subject: [PATCH 07/11] i hate ci --- .github/workflows/ci-suite.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index d50673c9e0..1c40a0f934 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -117,7 +117,7 @@ jobs: uses: actions/checkout@v1 - name: Upgrade NPM - run: npm install -g npm + run: sudo npm install -g npm - name: Build Docker Image run: docker build . -f build/Dockerfile @@ -133,9 +133,6 @@ jobs: uses: actions/setup-node@v1 with: node-version: 12.x - - - name: Upgrade NPM - run: sudo npm install -g npm - name: Setup dotnet uses: actions/setup-dotnet@v1 @@ -144,6 +141,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 From 31df05e26622928dd2291a7eebbed9b6af01b80a Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:19:37 -0400 Subject: [PATCH 08/11] maybe fix test units --- .github/workflows/ci-suite.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 1c40a0f934..dd97869858 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -129,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: From 9ce9bd76f78ca78b9deeccd53943bdac21a55c77 Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:20:34 -0400 Subject: [PATCH 09/11] Update Dockerfile --- build/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/Dockerfile b/build/Dockerfile index 507d8339c6..5d89187790 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -4,7 +4,7 @@ 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 RUN . $NVM_DIR/nvm.sh \ @@ -14,6 +14,7 @@ RUN . $NVM_DIR/nvm.sh \ && apt-get install -y \ dos2unix \ && rm -rf /var/lib/apt/lists/* +RUN npm install -g npm ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH From 4eec237e417d2991e4322386367573e217c583ec Mon Sep 17 00:00:00 2001 From: alexkar598 <25136265+alexkar598@users.noreply.github.com> Date: Tue, 26 Oct 2021 22:23:35 -0400 Subject: [PATCH 10/11] Update Dockerfile --- build/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index 5d89187790..bcda9788c4 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -14,11 +14,12 @@ RUN . $NVM_DIR/nvm.sh \ && apt-get install -y \ dos2unix \ && rm -rf /var/lib/apt/lists/* -RUN npm install -g npm - + ENV NODE_PATH $NVM_DIR/v$NODE_VERSION/lib/node_modules ENV PATH $NVM_DIR/versions/node/v$NODE_VERSION/bin:$PATH +RUN npm install -g npm + # Build web control panel WORKDIR /repo/build From 8d7d873ecdd45738c11e0d37d2732e905ea891f8 Mon Sep 17 00:00:00 2001 From: Jordan Brown Date: Wed, 27 Oct 2021 10:57:32 -0400 Subject: [PATCH 11/11] Cleanup Alex's work a little --- build/Dockerfile | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/build/Dockerfile b/build/Dockerfile index bcda9788c4..fb870efdfb 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -5,7 +5,10 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build RUN curl --silent -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.2/install.sh | sh 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,12 +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 - -RUN npm install -g npm + && rm -rf /var/lib/apt/lists/* \ + && npm install -g npm # Build web control panel WORKDIR /repo/build