From c2aac646fd395e2dfc09648e0f3d5b746c1db0ef Mon Sep 17 00:00:00 2001 From: mikhaillav Date: Thu, 29 Feb 2024 21:41:26 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D1=80=D0=B0=D0=B1?= =?UTF-8?q?=D0=BE=D1=82=D0=BA=D0=B0=20ci/cd=20(=D1=82=D0=B8=D0=BF=D0=B0=20?= =?UTF-8?q?=D0=BF=D0=BE=20git=20flow)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-gh-pages.yml | 6 ++---- .github/workflows/deploy-test-server.yml | 8 +++++++- .github/workflows/lint.yml | 7 ++----- 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index 46a6292..f87d9c2 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -1,11 +1,9 @@ name: Deploy mkdocs to github pages on: - pull_request: + push: branches: - - main - types: - [closed] + - "main" workflow_dispatch: permissions: diff --git a/.github/workflows/deploy-test-server.yml b/.github/workflows/deploy-test-server.yml index 7011e45..eb2a920 100644 --- a/.github/workflows/deploy-test-server.yml +++ b/.github/workflows/deploy-test-server.yml @@ -1,6 +1,12 @@ name: Deploy mkdocs to test server -on: workflow_dispatch +on: + push: + branches: + - "develop" + paths: + - "**.md" + workflow_dispatch: jobs: deploy: diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b97381c..d2a5431 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -1,12 +1,9 @@ name: Lint files on: - pull_request: - branches: - - main - types: - [opened] push: + branches: + - "!main" paths: - "**.md" From b4c0d50f02fe1dce565453c5bc535186e49006ff Mon Sep 17 00:00:00 2001 From: mikhaillav Date: Thu, 29 Feb 2024 22:09:09 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=B7=D0=B0=D0=B1=D1=8B=D0=BB=20=D1=83?= =?UTF-8?q?=D0=B1=D1=80=D0=B0=D1=82=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy-gh-pages.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/deploy-gh-pages.yml b/.github/workflows/deploy-gh-pages.yml index f87d9c2..e306207 100644 --- a/.github/workflows/deploy-gh-pages.yml +++ b/.github/workflows/deploy-gh-pages.yml @@ -11,7 +11,6 @@ permissions: jobs: deploy: - if: github.event.pull_request.merged == true runs-on: ubuntu-latest steps: