From 1c1623bd0fcb0735a6e7577856ffff92e08bf3e9 Mon Sep 17 00:00:00 2001 From: Max Lyuchin Date: Wed, 8 Mar 2023 20:39:32 +0300 Subject: [PATCH 1/2] update target branch for workflows --- .github/workflows/codeql-analysis.yml | 4 ++-- .github/workflows/cypress.yml | 4 ++-- .github/workflows/docs.yml | 2 +- .github/workflows/update-built-branch.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d76fe9e..8988399 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -13,10 +13,10 @@ name: 'CodeQL' on: push: - branches: [trunk] + branches: [trunk, develop] pull_request: # The branches below must be a subset of the branches above - branches: [trunk] + branches: [trunk, develop] schedule: - cron: '36 7 * * 6' diff --git a/.github/workflows/cypress.yml b/.github/workflows/cypress.yml index 2f8047b..4ccfbbb 100644 --- a/.github/workflows/cypress.yml +++ b/.github/workflows/cypress.yml @@ -2,10 +2,10 @@ name: E2E test on: push: - branches: [trunk] + branches: [trunk, develop] pull_request: # The branches below must be a subset of the branches above - branches: [trunk] + branches: [develop] schedule: - cron: '36 7 * * 6' diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 701d70f..756795b 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -3,7 +3,7 @@ name: Build and Deploy Documentation on: # Triggers the workflow on push or pull request events but only for the trunk branch push: - branches: [ trunk ] + branches: [ trunk, develop ] jobs: build-and-deploy: runs-on: ubuntu-latest diff --git a/.github/workflows/update-built-branch.yml b/.github/workflows/update-built-branch.yml index f254fa9..61535cb 100644 --- a/.github/workflows/update-built-branch.yml +++ b/.github/workflows/update-built-branch.yml @@ -2,7 +2,7 @@ name: Update built branch on: push: - branches: [trunk] + branches: [develop] jobs: build: From 8e441ec029fc6d5011e87beb377a53805ede7f2e Mon Sep 17 00:00:00 2001 From: Max Lyuchin Date: Fri, 10 Mar 2023 11:19:34 +0300 Subject: [PATCH 2/2] publish docs on release --- .github/workflows/docs.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 756795b..616d4f9 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -1,9 +1,9 @@ name: Build and Deploy Documentation on: - # Triggers the workflow on push or pull request events but only for the trunk branch - push: - branches: [ trunk, develop ] + release: + types: [published] + jobs: build-and-deploy: runs-on: ubuntu-latest