From 201d728451139367866bd35e0704cb676f000c36 Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Fri, 22 Apr 2022 12:39:17 -0700 Subject: [PATCH 1/3] Remove explicit node version for workbench Signed-off-by: Joshua Li --- .../workflows/sql-workbench-test-and-build-workflow.yml | 8 +++++++- workbench/package.json | 4 ---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index e824900e50..277454fd59 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -24,10 +24,16 @@ jobs: ref: ${{ env.OPENSEARCH_VERSION }} path: sql/OpenSearch-Dashboards + - name: Get node and yarn versions + id: versions_step + run: | + echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" + echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" + - name: Setup Node uses: actions/setup-node@v1 with: - node-version: '14.18.2' + node-version: ${{ steps.versions_step.outputs.node_version }} - name: Move Workbench to Plugins Dir run: | diff --git a/workbench/package.json b/workbench/package.json index 7d5263b1d3..d4b689c64f 100644 --- a/workbench/package.json +++ b/workbench/package.json @@ -42,10 +42,6 @@ "tslint-config-prettier": "^1.18.0", "tslint-plugin-prettier": "^2.0.1" }, - "engines": { - "node": "14.18.2", - "yarn": "^1.21.1" - }, "resolutions": { "**/@types/node": "10.12.27", "@types/react": "16.3.14", From 2b2d381005db09acf32282758e3db461b47dd09f Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Fri, 22 Apr 2022 12:42:57 -0700 Subject: [PATCH 2/3] Use nvmrc Signed-off-by: Joshua Li --- .../sql-workbench-test-and-build-workflow.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index 277454fd59..cd7d296416 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -24,16 +24,11 @@ jobs: ref: ${{ env.OPENSEARCH_VERSION }} path: sql/OpenSearch-Dashboards - - name: Get node and yarn versions - id: versions_step - run: | - echo "::set-output name=node_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.node).match(/[.0-9]+/)[0]")" - echo "::set-output name=yarn_version::$(node -p "(require('./OpenSearch-Dashboards/package.json').engines.yarn).match(/[.0-9]+/)[0]")" - - name: Setup Node - uses: actions/setup-node@v1 + uses: actions/setup-node@v2 with: - node-version: ${{ steps.versions_step.outputs.node_version }} + node-version-file: ".nvmrc" + registry-url: 'https://registry.npmjs.org' - name: Move Workbench to Plugins Dir run: | From 264d9c08da004a0bc96e2a608fc2dc27fae2b1ea Mon Sep 17 00:00:00 2001 From: Joshua Li Date: Fri, 22 Apr 2022 12:45:13 -0700 Subject: [PATCH 3/3] Update nvmrc path Signed-off-by: Joshua Li --- .github/workflows/sql-workbench-test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sql-workbench-test-and-build-workflow.yml b/.github/workflows/sql-workbench-test-and-build-workflow.yml index cd7d296416..cb1bae1abc 100644 --- a/.github/workflows/sql-workbench-test-and-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-and-build-workflow.yml @@ -27,7 +27,7 @@ jobs: - name: Setup Node uses: actions/setup-node@v2 with: - node-version-file: ".nvmrc" + node-version-file: "./OpenSearch-Dashboards/.nvmrc" registry-url: 'https://registry.npmjs.org' - name: Move Workbench to Plugins Dir