From e861ad316dc9c5ae3197c12625fa6f5fe2ef3b1e Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 14:13:30 -0800 Subject: [PATCH 1/2] Add single version flag during bootstrap to fix version conflicts Signed-off-by: Ryan Liang --- .github/workflows/cypress-e2e-sql-workbench-test.yml | 2 +- .github/workflows/ftr-e2e-sql-workbench-test.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cypress-e2e-sql-workbench-test.yml b/.github/workflows/cypress-e2e-sql-workbench-test.yml index f53ca3c4..3397c7b3 100644 --- a/.github/workflows/cypress-e2e-sql-workbench-test.yml +++ b/.github/workflows/cypress-e2e-sql-workbench-test.yml @@ -105,7 +105,7 @@ jobs: - name: Boodstrap Opensearch Dashboards run: | - yarn osd bootstrap + yarn osd bootstrap --single-version=loose working-directory: OpenSearch-Dashboards - name: Run Opensearch Dashboards with Query Workbench Installed diff --git a/.github/workflows/ftr-e2e-sql-workbench-test.yml b/.github/workflows/ftr-e2e-sql-workbench-test.yml index 800cc70e..148545c7 100644 --- a/.github/workflows/ftr-e2e-sql-workbench-test.yml +++ b/.github/workflows/ftr-e2e-sql-workbench-test.yml @@ -105,7 +105,7 @@ jobs: - name: Boodstrap Opensearch Dashboards run: | - yarn osd bootstrap + yarn osd bootstrap --single-version=loose working-directory: OpenSearch-Dashboards - name: Run Opensearch Dashboards with Query Workbench Installed diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 06d08f26..929b398d 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -46,7 +46,7 @@ jobs: - name: Bootstrap the plugin working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }} - run: yarn osd bootstrap + run: yarn osd bootstrap --single-version=loose - name: Get list of changed files using GitHub Action uses: lots0logs/gh-action-get-changed-files@2.2.2 From f67ab3c243150f4f331ca1ee16248d906f91abc1 Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 14:24:54 -0800 Subject: [PATCH 2/2] Add the flag to build workflow too Signed-off-by: Ryan Liang --- .github/workflows/sql-workbench-test-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/sql-workbench-test-build-workflow.yml b/.github/workflows/sql-workbench-test-build-workflow.yml index d363ea55..f13c286b 100644 --- a/.github/workflows/sql-workbench-test-build-workflow.yml +++ b/.github/workflows/sql-workbench-test-build-workflow.yml @@ -39,7 +39,7 @@ jobs: cd ./OpenSearch-Dashboards/ su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && cd ./plugins/dashboards-query-workbench && - whoami && yarn osd bootstrap && yarn run test:jest --coverage" + whoami && yarn osd bootstrap --single-version=loose && yarn run test:jest --coverage" - name: Upload coverage if: always() @@ -100,7 +100,7 @@ jobs: - name: Bootstrap plugin/opensearch-dashboards run: | cd OpenSearch-Dashboards/plugins/dashboards-query-workbench - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Test run: | cd OpenSearch-Dashboards/plugins/dashboards-query-workbench