From f22eabac33eef771b6a1d4456ac8fbc94d5e7edc Mon Sep 17 00:00:00 2001 From: Ashwin P Chandran Date: Mon, 21 Nov 2022 22:35:56 +0000 Subject: [PATCH 1/3] Reenable CI tests for feature branches Signed-off-by: Ashwin P Chandran --- .github/workflows/build_and_test_workflow.yml | 4 ++-- .github/workflows/cypress_workflow.yml | 2 +- CHANGELOG.md | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index f893f1398e5b..9e18928602ea 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -6,11 +6,11 @@ name: Build and test # trigger on every commit push and PR for all branches except feature branches and pushes for backport branches on: push: - branches: [ '**', '!feature/**', '!backport/**' ] + branches: [ '**', '!backport/**' ] paths-ignore: - '**/*.md' pull_request: - branches: [ '**', '!feature/**' ] + branches: [ '**' ] paths-ignore: - '**/*.md' diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 41b9d46aa32f..10984de89f24 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -3,7 +3,7 @@ name: Run cypress tests # trigger on every PR for all branches except feature branches on: pull_request: - branches: [ '**', '!feature/**' ] + branches: [ '**' ] paths-ignore: - '**/*.md' diff --git a/CHANGELOG.md b/CHANGELOG.md index e0691372f424..f7e9b2ace0b1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,6 +71,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Add CHANGELOG.md and related workflows ([#2414](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2414)) - Update backport custom branch name to utilize head template ([#2766](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2766)) +- Re-enable CI workflows for feature branckes ### 📝 Documentation From 30000695f77bd02dc8eba32fcc34329415e5e693 Mon Sep 17 00:00:00 2001 From: Ashwin P Chandran Date: Mon, 21 Nov 2022 22:41:00 +0000 Subject: [PATCH 2/3] Updates changelog Signed-off-by: Ashwin P Chandran --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7e9b2ace0b1..c9e4742ace89 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -71,7 +71,7 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) - Add CHANGELOG.md and related workflows ([#2414](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2414)) - Update backport custom branch name to utilize head template ([#2766](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2766)) -- Re-enable CI workflows for feature branckes +- Re-enable CI workflows for feature branckes ([#2908](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/2908)) ### 📝 Documentation From a7098aa8856af8a2e8f12c0dc371d264a626b676 Mon Sep 17 00:00:00 2001 From: Ashwin P Chandran Date: Tue, 22 Nov 2022 23:47:29 +0000 Subject: [PATCH 3/3] updates comments Signed-off-by: Ashwin P Chandran --- .github/workflows/build_and_test_workflow.yml | 2 +- .github/workflows/cypress_workflow.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_and_test_workflow.yml b/.github/workflows/build_and_test_workflow.yml index 9e18928602ea..d45817bd45b3 100644 --- a/.github/workflows/build_and_test_workflow.yml +++ b/.github/workflows/build_and_test_workflow.yml @@ -3,7 +3,7 @@ name: Build and test -# trigger on every commit push and PR for all branches except feature branches and pushes for backport branches +# trigger on every commit push and PR for all branches except pushes for backport branches on: push: branches: [ '**', '!backport/**' ] diff --git a/.github/workflows/cypress_workflow.yml b/.github/workflows/cypress_workflow.yml index 10984de89f24..5c3371db0f72 100644 --- a/.github/workflows/cypress_workflow.yml +++ b/.github/workflows/cypress_workflow.yml @@ -1,6 +1,6 @@ name: Run cypress tests -# trigger on every PR for all branches except feature branches +# trigger on every PR for all branches on: pull_request: branches: [ '**' ]