From 736842810acd2b38bad25145a5d4d787dc09a6dc Mon Sep 17 00:00:00 2001 From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com> Date: Wed, 7 Feb 2024 15:47:34 -0500 Subject: [PATCH] clean up --- .github/workflows/build_and_test_debug_client.yml | 6 +++--- .github/workflows/build_and_test_debug_manager.yml | 4 ++-- server_manager/electron_main.webpack.mjs | 2 -- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build_and_test_debug_client.yml b/.github/workflows/build_and_test_debug_client.yml index 335127f38e..04a4c0372b 100644 --- a/.github/workflows/build_and_test_debug_client.yml +++ b/.github/workflows/build_and_test_debug_client.yml @@ -1,4 +1,4 @@ -name: Build and Test - Client +name: Build and Test / Client concurrency: group: '${{ github.head_ref || github.ref }} Client' @@ -59,7 +59,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: 18 + node-version-file: .nvmrc cache: npm cache-dependency-path: ./package-lock.json @@ -242,7 +242,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: nvmrc + node-version-file: .nvmrc cache: npm cache-dependency-path: ./package-lock.json diff --git a/.github/workflows/build_and_test_debug_manager.yml b/.github/workflows/build_and_test_debug_manager.yml index 77d43ad6e8..48d0b8d591 100644 --- a/.github/workflows/build_and_test_debug_manager.yml +++ b/.github/workflows/build_and_test_debug_manager.yml @@ -1,4 +1,4 @@ -name: Build and Test - Manager +name: Build and Test / Manager concurrency: group: '${{ github.head_ref || github.ref }} Manager' @@ -115,7 +115,7 @@ jobs: - name: Install Node uses: actions/setup-node@v3 with: - node-version: .nvmrc + node-version-file: .nvmrc cache: npm cache-dependency-path: ./server_manager/package.json diff --git a/server_manager/electron_main.webpack.mjs b/server_manager/electron_main.webpack.mjs index f06db6e0ee..ad20a264c5 100644 --- a/server_manager/electron_main.webpack.mjs +++ b/server_manager/electron_main.webpack.mjs @@ -20,8 +20,6 @@ import nodeExternals from 'webpack-node-externals'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); -console.log(path.resolve(__dirname, '../output/build/server_manager/electron_app/static')); - export default { entry: path.resolve(__dirname, './electron_app/index.ts'), target: 'electron-main',