From 7eedb6985aeca3b4d50ae3f757859483f8e0cfd0 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 19 Feb 2024 13:16:06 -0500 Subject: [PATCH 1/2] Add loose flag to unblock CI Signed-off-by: Derek Ho --- .github/actions/install-dashboards/action.yml | 2 +- .github/workflows/verify-binary-installation.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/install-dashboards/action.yml b/.github/actions/install-dashboards/action.yml index 7cb9a7aef..45f89e983 100644 --- a/.github/actions/install-dashboards/action.yml +++ b/.github/actions/install-dashboards/action.yml @@ -82,4 +82,4 @@ runs: with: timeout_minutes: 20 max_attempts: 2 - command: yarn --cwd OpenSearch-Dashboards osd bootstrap --oss + command: yarn --cwd OpenSearch-Dashboards osd bootstrap --oss --single-version=loose diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index 95c442fc3..4326a8447 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -92,7 +92,7 @@ jobs: npm i -g yarn@${{ steps.tool-versions.outputs.yarn_version }} yarn cache clean yarn add sha.js - yarn osd bootstrap + yarn osd bootstrap --single-version=loose scripts/use_node scripts/build working-directory: OpenSearch-Dashboards shell: bash @@ -103,7 +103,7 @@ jobs: - name: Install dependencies run: | - yarn osd bootstrap + yarn osd bootstrap --single-version=loose working-directory: OpenSearch-Dashboards shell: bash From b4738bcf2e7ab55d6bf748e3ca2e102718123c70 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 19 Feb 2024 13:50:30 -0500 Subject: [PATCH 2/2] Add comments as to why this is necessary Signed-off-by: Derek Ho --- .github/actions/install-dashboards/action.yml | 2 +- .github/workflows/verify-binary-installation.yml | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/actions/install-dashboards/action.yml b/.github/actions/install-dashboards/action.yml index 45f89e983..e198f2dbb 100644 --- a/.github/actions/install-dashboards/action.yml +++ b/.github/actions/install-dashboards/action.yml @@ -82,4 +82,4 @@ runs: with: timeout_minutes: 20 max_attempts: 2 - command: yarn --cwd OpenSearch-Dashboards osd bootstrap --oss --single-version=loose + command: yarn --cwd OpenSearch-Dashboards osd bootstrap --oss --single-version=loose # loose is passed in to ignore version conflicts on cypress version used in OSD and this repo diff --git a/.github/workflows/verify-binary-installation.yml b/.github/workflows/verify-binary-installation.yml index 4326a8447..cca92cb5a 100644 --- a/.github/workflows/verify-binary-installation.yml +++ b/.github/workflows/verify-binary-installation.yml @@ -85,6 +85,7 @@ jobs: node-version: ${{ steps.tool-versions.outputs.node_version }} registry-url: 'https://registry.npmjs.org' + # loose is passed in to ignore version conflicts on cypress version used in OSD and this repo - name: Setup Opensearch Dashboards run: | npm uninstall -g yarn @@ -92,7 +93,7 @@ jobs: npm i -g yarn@${{ steps.tool-versions.outputs.yarn_version }} yarn cache clean yarn add sha.js - yarn osd bootstrap --single-version=loose + yarn osd bootstrap --single-version=loose scripts/use_node scripts/build working-directory: OpenSearch-Dashboards shell: bash @@ -101,6 +102,7 @@ jobs: with: path: OpenSearch-Dashboards/plugins/security-dashboards-plugin + # loose is passed in to ignore version conflicts on cypress version used in OSD and this repo - name: Install dependencies run: | yarn osd bootstrap --single-version=loose