From 64400f5c561c3e3575807513e2ba6e2d7a8acd81 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 21 Feb 2024 09:10:39 -0500 Subject: [PATCH 1/4] Add single version loose param Signed-off-by: Derek Ho --- scripts/default/opensearch-dashboards/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/default/opensearch-dashboards/build.sh b/scripts/default/opensearch-dashboards/build.sh index 0219aa707a..0bf2c3b535 100755 --- a/scripts/default/opensearch-dashboards/build.sh +++ b/scripts/default/opensearch-dashboards/build.sh @@ -98,7 +98,7 @@ mkdir -p $OUTPUT/plugins cp -r ../$PLUGIN_NAME/ ../OpenSearch-Dashboards/plugins echo "BUILD MODULES FOR $PLUGIN_NAME" CURR_DIR=`pwd` -cd ../OpenSearch-Dashboards; eval $NVM_CMD; yarn osd bootstrap +cd ../OpenSearch-Dashboards; eval $NVM_CMD; yarn osd bootstrap --single-version=loose echo "BUILD RELEASE ZIP FOR $PLUGIN_NAME" cd plugins/$PLUGIN_NAME; yarn $HELPER_STRING build --opensearch-dashboards-version=$VERSION$QUALIFIER_IDENTIFIER cd $CURR_DIR From 14e0aac49ea8394633dba5535b4821d059142830 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Tue, 27 Feb 2024 14:53:33 -0500 Subject: [PATCH 2/4] Add parameter for version inc workflow Signed-off-by: Derek Ho --- .github/workflows/osd-increment-plugin-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml index b2af42bf23..16f2943ff8 100644 --- a/.github/workflows/osd-increment-plugin-versions.yml +++ b/.github/workflows/osd-increment-plugin-versions.yml @@ -85,7 +85,7 @@ jobs: run: | cd OpenSearch-Dashboards/plugins/${{ matrix.entry.repo }} if [ ${{ matrix.entry.path }} ]; then - yarn osd bootstrap + yarn osd bootstrap --single-version=loose cp -R ${{ matrix.entry.path }} ../ cd ../${{ matrix.entry.path }} node ../../scripts/plugin_helpers version --sync legacy From 04a994e60cee3b3bd30925d187289d5ecfbe9f7c Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Wed, 28 Feb 2024 15:04:14 -0500 Subject: [PATCH 3/4] Add loose parameter to else block bootstrap Signed-off-by: Derek Ho --- .github/workflows/osd-increment-plugin-versions.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/osd-increment-plugin-versions.yml b/.github/workflows/osd-increment-plugin-versions.yml index 16f2943ff8..db7ccc1ae4 100644 --- a/.github/workflows/osd-increment-plugin-versions.yml +++ b/.github/workflows/osd-increment-plugin-versions.yml @@ -101,7 +101,7 @@ jobs: OSD_PLUGIN_VERSION=$(node -p "require('./package.json').version") echo "OSD_PLUGIN_VERSION=$OSD_PLUGIN_VERSION" >> $GITHUB_ENV else - yarn osd bootstrap + yarn osd bootstrap --single-version=loose node ../../scripts/plugin_helpers version --sync legacy OSD_PLUGIN_VERSION=$(node -p "require('./package.json').version") echo "OSD_PLUGIN_VERSION=$OSD_PLUGIN_VERSION" >> $GITHUB_ENV From 08195e2a1ccef6a270ae66b46c0f1ad3901de136 Mon Sep 17 00:00:00 2001 From: Derek Ho Date: Mon, 15 Jul 2024 15:29:56 -0400 Subject: [PATCH 4/4] Remove loose in default build Signed-off-by: Derek Ho --- scripts/default/opensearch-dashboards/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/default/opensearch-dashboards/build.sh b/scripts/default/opensearch-dashboards/build.sh index 0bf2c3b535..0219aa707a 100755 --- a/scripts/default/opensearch-dashboards/build.sh +++ b/scripts/default/opensearch-dashboards/build.sh @@ -98,7 +98,7 @@ mkdir -p $OUTPUT/plugins cp -r ../$PLUGIN_NAME/ ../OpenSearch-Dashboards/plugins echo "BUILD MODULES FOR $PLUGIN_NAME" CURR_DIR=`pwd` -cd ../OpenSearch-Dashboards; eval $NVM_CMD; yarn osd bootstrap --single-version=loose +cd ../OpenSearch-Dashboards; eval $NVM_CMD; yarn osd bootstrap echo "BUILD RELEASE ZIP FOR $PLUGIN_NAME" cd plugins/$PLUGIN_NAME; yarn $HELPER_STRING build --opensearch-dashboards-version=$VERSION$QUALIFIER_IDENTIFIER cd $CURR_DIR