From 600184c925192d42f97b7fe8dcf6911d6a18db8d Mon Sep 17 00:00:00 2001 From: RedlineTriad <39059512+RedlineTriad@users.noreply.github.com> Date: Fri, 30 Jun 2023 21:53:29 +0200 Subject: [PATCH 1/4] chore: update package-log.json --- package-lock.json | 14 +++++++------- release/app/package-lock.json | 20 ++++++++++++++++++-- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/package-lock.json b/package-lock.json index a0c6aadd..2f4ab9ae 100644 --- a/package-lock.json +++ b/package-lock.json @@ -81,7 +81,7 @@ "css-loader": "^6.7.1", "css-minimizer-webpack-plugin": "^4.1.0", "detect-port": "^1.3.0", - "electron": "^25.2.0", + "electron": "^24.3.1", "electron-builder": "^24.4.0", "electron-devtools-installer": "^3.2.0", "electron-notarize": "^1.2.1", @@ -6561,9 +6561,9 @@ } }, "node_modules/electron": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.2.0.tgz", - "integrity": "sha512-I/rhcW2sV2fyiveVSBr2N7v5ZiCtdGY0UiNCDZgk2fpSC+irQjbeh7JT2b4vWmJ2ogOXBjqesrN9XszTIG6DHg==", + "version": "24.6.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-24.6.1.tgz", + "integrity": "sha512-SXbRtatpvBqtOwlOiEbaI47Repspz5a/qoaNZ+GB3DLhi9Z0r28t14pu+a9nXgX5tXj8lOfN8D9wmwVYdo4TAg==", "dev": true, "hasInstallScript": true, "dependencies": { @@ -23797,9 +23797,9 @@ } }, "electron": { - "version": "25.2.0", - "resolved": "https://registry.npmjs.org/electron/-/electron-25.2.0.tgz", - "integrity": "sha512-I/rhcW2sV2fyiveVSBr2N7v5ZiCtdGY0UiNCDZgk2fpSC+irQjbeh7JT2b4vWmJ2ogOXBjqesrN9XszTIG6DHg==", + "version": "24.6.1", + "resolved": "https://registry.npmjs.org/electron/-/electron-24.6.1.tgz", + "integrity": "sha512-SXbRtatpvBqtOwlOiEbaI47Repspz5a/qoaNZ+GB3DLhi9Z0r28t14pu+a9nXgX5tXj8lOfN8D9wmwVYdo4TAg==", "dev": true, "requires": { "@electron/get": "^2.0.0", diff --git a/release/app/package-lock.json b/release/app/package-lock.json index b4d6d537..5344d7fd 100644 --- a/release/app/package-lock.json +++ b/release/app/package-lock.json @@ -1,8 +1,24 @@ { "name": "bs-manager", - "version": "1.1.1", - "lockfileVersion": 1, + "version": "1.2.0", + "lockfileVersion": 2, "requires": true, + "packages": { + "": { + "name": "bs-manager", + "version": "1.2.0", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { + "ctrlc-windows": "^2.1.0" + } + }, + "node_modules/ctrlc-windows": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/ctrlc-windows/-/ctrlc-windows-2.1.0.tgz", + "integrity": "sha512-OrX5KI+K+2NMN91QIhYZdW7VDO2YsSdTZW494pA7Nvw/wBdU2hz+MGP006bR978zOTrG6Q8EIeJvLJmLqc6MsQ==" + } + }, "dependencies": { "ctrlc-windows": { "version": "2.1.0", From ecc5d8c2b853ab9a9fb0d508d3bad976c0caeec5 Mon Sep 17 00:00:00 2001 From: RedlineTriad <39059512+RedlineTriad@users.noreply.github.com> Date: Fri, 30 Jun 2023 21:53:42 +0200 Subject: [PATCH 2/4] ci: add automated build testing --- .github/workflows/node.js.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 .github/workflows/node.js.yaml diff --git a/.github/workflows/node.js.yaml b/.github/workflows/node.js.yaml new file mode 100644 index 00000000..12d6402c --- /dev/null +++ b/.github/workflows/node.js.yaml @@ -0,0 +1,30 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Node.js CI + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + strategy: + matrix: + os: [ubuntu-latest, windows-latest, macos-latest] + + runs-on: ${{ matrix.os }} + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: 18.x + cache: 'npm' + - run: npm ci + - run: npm run build + # Tests are currently failing + # - run: npm test From aeb9a449cab31ea2581551188bf3356c52717077 Mon Sep 17 00:00:00 2001 From: RedlineTriad <39059512+RedlineTriad@users.noreply.github.com> Date: Fri, 30 Jun 2023 22:38:13 +0200 Subject: [PATCH 3/4] ci: add automated testing Doesn't actually succeed yet because there are quite a few errors. --- .github/workflows/node.js.yaml | 5 +++-- package.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/node.js.yaml b/.github/workflows/node.js.yaml index 12d6402c..4f0ffcc0 100644 --- a/.github/workflows/node.js.yaml +++ b/.github/workflows/node.js.yaml @@ -26,5 +26,6 @@ jobs: cache: 'npm' - run: npm ci - run: npm run build - # Tests are currently failing - # - run: npm test + - run: npm test + # Currently typescript, eslint, and prettier are unhappy + continue-on-error: true diff --git a/package.json b/package.json index 32f00d0c..12e2a6f1 100644 --- a/package.json +++ b/package.json @@ -136,7 +136,7 @@ ], "moduleDirectories": [ "node_modules", - "release/app/node_modules" + "src" ], "testPathIgnorePatterns": [ "release/app/dist" From b1ac8bd6fe79b48e18167650bdbc7a09a15dd16b Mon Sep 17 00:00:00 2001 From: RedlineTriad <39059512+RedlineTriad@users.noreply.github.com> Date: Fri, 30 Jun 2023 22:54:25 +0200 Subject: [PATCH 4/4] ci: add basic linting Currently always fails. We can switch to differential linting or fix all of them later. --- .github/workflows/lint.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 .github/workflows/lint.yaml diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml new file mode 100644 index 00000000..1f0eab3d --- /dev/null +++ b/.github/workflows/lint.yaml @@ -0,0 +1,24 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Linting + +on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js + uses: actions/setup-node@v3 + with: + node-version: 18.x + cache: 'npm' + - run: npm ci + - run: npm run lint