From 32cdce424e96bd10820f20175a8d68bbec453a4e Mon Sep 17 00:00:00 2001 From: Christopher Stryker <30416097+ChrisStrykesAgain@users.noreply.github.com> Date: Wed, 19 Feb 2025 08:46:03 -0600 Subject: [PATCH 01/11] Update ci.yml --- .github/workflows/ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 278fbb2..b98efdf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,6 +19,12 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive + + - name: Setup Node.js environment + uses: actions/setup-node@v3 + with: + node-version: '20' + cache: 'npm' - name: Create .npmrc run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc From 232685fb583f1631349ba24fabfc9bde9451202d Mon Sep 17 00:00:00 2001 From: Christopher Stryker <30416097+ChrisStrykesAgain@users.noreply.github.com> Date: Wed, 19 Feb 2025 08:53:58 -0600 Subject: [PATCH 02/11] reorder operations --- .github/workflows/ci.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b98efdf..c91717e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,17 +19,17 @@ jobs: - uses: actions/checkout@v2 with: submodules: recursive - - - name: Setup Node.js environment - uses: actions/setup-node@v3 - with: - node-version: '20' - cache: 'npm' - name: Create .npmrc run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ~/.npmrc env: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} + + - name: Setup Node.js environment + uses: actions/setup-node@v3 + with: + node-version: '20' + cache: 'npm' - name: Run build script run: bash build.sh From 324755238a1ce89dd54b80cd57671d9f0e56a27b Mon Sep 17 00:00:00 2001 From: Christopher Stryker Date: Wed, 19 Feb 2025 09:22:58 -0600 Subject: [PATCH 03/11] update gitignore so that node_modules aren't tracked --- .gitignore | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 395b11c..3011ef0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -build/ -external-plugins/ +build/ +node_modules/ .DS_STORE \ No newline at end of file From ce15fdf560cb6a6cfb0d9cc8b9fd3bb4b3095d6f Mon Sep 17 00:00:00 2001 From: Christopher Stryker <30416097+ChrisStrykesAgain@users.noreply.github.com> Date: Wed, 19 Feb 2025 09:49:46 -0600 Subject: [PATCH 04/11] Update ci.yml bump down to 18 for consistency with current implementation --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c91717e..87522b9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -28,7 +28,7 @@ jobs: - name: Setup Node.js environment uses: actions/setup-node@v3 with: - node-version: '20' + node-version: '18' cache: 'npm' - name: Run build script From 53abf98fe3493a330cef443d337a69faa6e8affc Mon Sep 17 00:00:00 2001 From: Christopher Stryker Date: Wed, 19 Feb 2025 09:55:24 -0600 Subject: [PATCH 05/11] include bare file to make node install work correctly in pipeline --- package-lock.json | 17 +++++++++++++++++ package.json | 13 +++++++++++++ 2 files changed, 30 insertions(+) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..de7a802 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,17 @@ +{ + "name": "ni-system-link-server-grafana-plugins", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "ni-system-link-server-grafana-plugins", + "version": "1.0.0", + "license": "Apache-2.0", + "devDependencies": {}, + "engines": { + "node": ">=18" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..06c4009 --- /dev/null +++ b/package.json @@ -0,0 +1,13 @@ +{ + "name": "ni-system-link-server-grafana-plugins", + "version": "1.0.0", + "description": "SystemLink Server plugins for Grafana", + "scripts": {}, + "author": "Carson Moore", + "license": "Apache-2.0", + "devDependencies": {}, + "engines": { + "node": ">=18" + }, + "dependencies": {} +} From 1d320240099dc34efd2b85a8984d0c8b06bbbb4e Mon Sep 17 00:00:00 2001 From: Christopher Stryker <30416097+ChrisStrykesAgain@users.noreply.github.com> Date: Wed, 19 Feb 2025 12:02:44 -0600 Subject: [PATCH 06/11] Update to action v4 per feedback on PR --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 87522b9..aa9517b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,7 +26,7 @@ jobs: NPM_TOKEN: ${{ secrets.NPM_TOKEN }} - name: Setup Node.js environment - uses: actions/setup-node@v3 + uses: actions/setup-node@v4 with: node-version: '18' cache: 'npm' From 375b54c4b553d1a2e7249f6416c8ecd4c82132bb Mon Sep 17 00:00:00 2001 From: Christopher Stryker Date: Wed, 19 Feb 2025 12:07:49 -0600 Subject: [PATCH 07/11] Removing all but core elements to serve as a placeholder for now. --- package-lock.json | 10 ++-------- package.json | 14 +++----------- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/package-lock.json b/package-lock.json index de7a802..e8c22a5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,11 @@ { - "name": "ni-system-link-server-grafana-plugins", + "name": "@ni-private/ni-system-link-server-grafana-plugins", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "ni-system-link-server-grafana-plugins", - "version": "1.0.0", - "license": "Apache-2.0", - "devDependencies": {}, - "engines": { - "node": ">=18" - } + "name": "@ni-private/ni-system-link-server-grafana-plugins" } } } diff --git a/package.json b/package.json index 06c4009..43ca948 100644 --- a/package.json +++ b/package.json @@ -1,13 +1,5 @@ { - "name": "ni-system-link-server-grafana-plugins", - "version": "1.0.0", - "description": "SystemLink Server plugins for Grafana", - "scripts": {}, - "author": "Carson Moore", - "license": "Apache-2.0", - "devDependencies": {}, - "engines": { - "node": ">=18" - }, - "dependencies": {} + "name": "@ni-private/ni-system-link-server-grafana-plugins", + "description": "Placeholder package for SystemLink Server plugins for Grafana", + "private": true } From 30ca73b94f372d0865fe160d7d831eda639454b6 Mon Sep 17 00:00:00 2001 From: Christopher Stryker Date: Wed, 19 Feb 2025 12:17:41 -0600 Subject: [PATCH 08/11] testing to see if action upgrade removes the need for the dummy package. --- package-lock.json | 11 ----------- package.json | 5 ----- 2 files changed, 16 deletions(-) delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index e8c22a5..0000000 --- a/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ni-private/ni-system-link-server-grafana-plugins", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@ni-private/ni-system-link-server-grafana-plugins" - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index 43ca948..0000000 --- a/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@ni-private/ni-system-link-server-grafana-plugins", - "description": "Placeholder package for SystemLink Server plugins for Grafana", - "private": true -} From 139aa789719f84477d2c9de46b6323c75e8fc223 Mon Sep 17 00:00:00 2001 From: Christopher Stryker Date: Wed, 19 Feb 2025 12:18:33 -0600 Subject: [PATCH 09/11] Revert "testing to see if action upgrade removes the need for the dummy package." This reverts commit 30ca73b94f372d0865fe160d7d831eda639454b6. --- package-lock.json | 11 +++++++++++ package.json | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 package-lock.json create mode 100644 package.json diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..e8c22a5 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,11 @@ +{ + "name": "@ni-private/ni-system-link-server-grafana-plugins", + "version": "1.0.0", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "@ni-private/ni-system-link-server-grafana-plugins" + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..43ca948 --- /dev/null +++ b/package.json @@ -0,0 +1,5 @@ +{ + "name": "@ni-private/ni-system-link-server-grafana-plugins", + "description": "Placeholder package for SystemLink Server plugins for Grafana", + "private": true +} From 3b373a06483b075ec2bd3f9a905033340dcada07 Mon Sep 17 00:00:00 2001 From: Christopher Stryker <30416097+ChrisStrykesAgain@users.noreply.github.com> Date: Wed, 19 Feb 2025 13:33:01 -0600 Subject: [PATCH 10/11] remove cache specifier --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa9517b..06cf625 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -29,7 +29,6 @@ jobs: uses: actions/setup-node@v4 with: node-version: '18' - cache: 'npm' - name: Run build script run: bash build.sh From 156e6e7af226a7e3fb999e86a8de19d9248e31b5 Mon Sep 17 00:00:00 2001 From: Christopher Stryker Date: Wed, 19 Feb 2025 13:34:26 -0600 Subject: [PATCH 11/11] testing again by removing package file --- package-lock.json | 11 ----------- package.json | 5 ----- 2 files changed, 16 deletions(-) delete mode 100644 package-lock.json delete mode 100644 package.json diff --git a/package-lock.json b/package-lock.json deleted file mode 100644 index e8c22a5..0000000 --- a/package-lock.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "name": "@ni-private/ni-system-link-server-grafana-plugins", - "version": "1.0.0", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@ni-private/ni-system-link-server-grafana-plugins" - } - } -} diff --git a/package.json b/package.json deleted file mode 100644 index 43ca948..0000000 --- a/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@ni-private/ni-system-link-server-grafana-plugins", - "description": "Placeholder package for SystemLink Server plugins for Grafana", - "private": true -}