From 57f8a9eb9dbdd6ef56f72e33a502a369824863cc Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Thu, 23 Nov 2023 02:35:16 +0000 Subject: [PATCH 1/2] Upate to latet babel package name (#140) Signed-off-by: Hailong Cui (cherry picked from commit 29c191c3e6763e305b2bdb7ba36fb6216b8167a2) Signed-off-by: github-actions[bot] --- .babelrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.babelrc b/.babelrc index 83ad455a..4e3f6ccc 100644 --- a/.babelrc +++ b/.babelrc @@ -12,7 +12,7 @@ "plugins": [ "@babel/plugin-transform-modules-commonjs", ["@babel/plugin-transform-runtime", { "regenerator": true }], - "@babel/plugin-proposal-class-properties", - "@babel/plugin-proposal-object-rest-spread" + "@babel/plugin-transform-class-properties", + "@babel/plugin-transform-object-rest-spread" ] -} \ No newline at end of file +} From ae77b1722378970530eecef03853bce0e2d95e61 Mon Sep 17 00:00:00 2001 From: SuZhou-Joe Date: Thu, 23 Nov 2023 11:18:01 +0800 Subject: [PATCH 2/2] feat: make workflow run in 2.x branch Signed-off-by: SuZhou-Joe --- ...fications-test-and-build-workflow-prod-docker-linux.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml index fe00d94f..317c7ad3 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow-prod-docker-linux.yml @@ -9,9 +9,8 @@ on: [pull_request, push] env: PLUGIN_NAME: notifications-dashboards - OPENSEARCH_DASHBOARDS_VERSION: 'main' - NOTIFICATIONS_PLUGIN_VERSION: 'main' - OPENSEARCH_VERSION: '3.0.0-SNAPSHOT' + OPENSEARCH_DASHBOARDS_VERSION: '2.x' + NOTIFICATIONS_PLUGIN_VERSION: '2.x' jobs: Get-CI-Image-Tag: @@ -73,7 +72,7 @@ jobs: run: | chown -R 1000:1000 `pwd` cd notifications/notifications - su `id -un 1000` -c "nohup ./gradlew run -Dopensearch.version=${{ env.OPENSEARCH_VERSION }} -x integTest -x jacocoTestReport &" + su `id -un 1000` -c "nohup ./gradlew run -x integTest -x jacocoTestReport &" timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:9200)" != "200" ]]; do sleep 5; done' shell: bash env: