From 57e14a596278d4d9db830e149e67506597565447 Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 14:09:11 -0800 Subject: [PATCH 1/3] Add single version flag during bootstrap to fix version conflicts Signed-off-by: Ryan Liang --- .github/workflows/cypress-e2e-gantt-chart-test.yml | 2 +- .github/workflows/ftr-e2e-gantt-chart-test.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cypress-e2e-gantt-chart-test.yml b/.github/workflows/cypress-e2e-gantt-chart-test.yml index 39163c2..0399273 100644 --- a/.github/workflows/cypress-e2e-gantt-chart-test.yml +++ b/.github/workflows/cypress-e2e-gantt-chart-test.yml @@ -93,7 +93,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 Gantt Chart Installed diff --git a/.github/workflows/ftr-e2e-gantt-chart-test.yml b/.github/workflows/ftr-e2e-gantt-chart-test.yml index dde2a82..3767133 100644 --- a/.github/workflows/ftr-e2e-gantt-chart-test.yml +++ b/.github/workflows/ftr-e2e-gantt-chart-test.yml @@ -96,7 +96,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 Gantt Chart Installed diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1bed4a8..47800f4 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -45,7 +45,7 @@ jobs: - name: Bootstrap the plugin working-directory: OpenSearch-Dashboards/plugins/dashboards-visualizations - 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 da0ff5cd17f4ddba3def3fa483047381559f18d5 Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 14:19:53 -0800 Subject: [PATCH 2/3] Add the flag to build workflow too Signed-off-by: Ryan Liang --- .github/workflows/test-and-build-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index 10e1356..c563d62 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -43,7 +43,7 @@ jobs: cd OpenSearch-Dashboards/ su `id -un 1000` -c "source $NVM_DIR/nvm.sh && nvm use && node -v && yarn -v && cd ./plugins/dashboards-visualizations && - whoami && yarn osd bootstrap && yarn lint:style && yarn test --coverage" + whoami && yarn osd bootstrap --single-version=loose && yarn lint:style && yarn test --coverage" - name: Upload coverage uses: codecov/codecov-action@v1 From 9111c6703ac8625e95448485c48a05950861fafb Mon Sep 17 00:00:00 2001 From: Ryan Liang Date: Mon, 19 Feb 2024 14:21:14 -0800 Subject: [PATCH 3/3] Add the flag to build workflow too 2 Signed-off-by: Ryan Liang --- .github/workflows/test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-and-build-workflow.yml b/.github/workflows/test-and-build-workflow.yml index c563d62..a0353f5 100644 --- a/.github/workflows/test-and-build-workflow.yml +++ b/.github/workflows/test-and-build-workflow.yml @@ -104,7 +104,7 @@ jobs: - name: Plugin Bootstrap run: | cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Run Stylelint run: | @@ -165,7 +165,7 @@ jobs: - name: Plugin Bootstrap run: | cd ./OpenSearch-Dashboards/plugins/dashboards-visualizations - yarn osd bootstrap + yarn osd bootstrap --single-version=loose - name: Run Stylelint run: |