From f68a13c2bb90f1eb97de522e1dad2cf33ffa7b02 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Thu, 19 Sep 2024 15:01:37 -0700 Subject: [PATCH 1/2] Fix cache cypress Signed-off-by: Joanne Wang --- .../dashboards-notifications-test-and-build-workflow.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml index 73da70c7..ada0b8d0 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml @@ -57,7 +57,7 @@ jobs: run: | git config --system core.longpaths true subst 'X:' . - + - name: enable long paths in git if: ${{ matrix.os == 'windows-latest' }} run: | @@ -170,7 +170,7 @@ jobs: uses: actions/cache@v2 with: path: ${{ matrix.cypress_cache_folder }} - key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('**/package.json') }} + key: cypress-cache-v2-${{ runner.os }}-${{ hashFiles('OpenSearch-Dashboards/plugins/dashboards-notifications/package.json') }} - name: Reset npm's script shell if: ${{ matrix.os == 'windows-latest' }} From c52f61105924d9390dc7d1f5970204f90c3659a3 Mon Sep 17 00:00:00 2001 From: Joanne Wang Date: Thu, 19 Sep 2024 16:22:47 -0700 Subject: [PATCH 2/2] change branch to 2.17 instead of 2.x Signed-off-by: Joanne Wang --- ...otifications-test-and-build-workflow-prod-docker-linux.yml | 4 ++-- .../dashboards-notifications-test-and-build-workflow.yml | 4 ++-- 2 files changed, 4 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 9bc6ffbd..b474b001 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,8 +9,8 @@ on: [pull_request, push] env: PLUGIN_NAME: notifications-dashboards - OPENSEARCH_DASHBOARDS_VERSION: '2.x' - NOTIFICATIONS_PLUGIN_VERSION: '2.x' + OPENSEARCH_DASHBOARDS_VERSION: '2.17.0' + NOTIFICATIONS_PLUGIN_VERSION: '2.17.0.0' jobs: Get-CI-Image-Tag: diff --git a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml index ada0b8d0..85234504 100644 --- a/.github/workflows/dashboards-notifications-test-and-build-workflow.yml +++ b/.github/workflows/dashboards-notifications-test-and-build-workflow.yml @@ -9,8 +9,8 @@ on: [pull_request, push] env: PLUGIN_NAME: notifications-dashboards - OPENSEARCH_DASHBOARDS_VERSION: '2.x' - NOTIFICATIONS_PLUGIN_VERSION: '2.x' + OPENSEARCH_DASHBOARDS_VERSION: '2.17.0' + NOTIFICATIONS_PLUGIN_VERSION: '2.17.0.0' jobs: tests: