From e6716e3590ab5726aac7daa4f9acfaab034a7f88 Mon Sep 17 00:00:00 2001 From: HandyS11 Date: Fri, 29 Mar 2024 01:52:12 +0100 Subject: [PATCH] update CI --- .github/workflows/CD.yml | 16 +++------------- .github/workflows/CI.yml | 4 ++-- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/.github/workflows/CD.yml b/.github/workflows/CD.yml index e4753f4..3d8fcbb 100644 --- a/.github/workflows/CD.yml +++ b/.github/workflows/CD.yml @@ -1,20 +1,10 @@ name: Continuous Deployment on: - workflow_run: - workflows: ["CI.yml Continuous Integration"] - types: - - completed + push: + branches: [ "main" ] -jobs: - check_branch: - runs-on: ubuntu-latest - outputs: - is_main: ${{ steps.check.outputs.is_main }} - steps: - - id: check - run: echo "::set-output name=is_main::${{ github.event.workflow_run.head_branch == 'main' }}" - +jobs: build-and-deploy: runs-on: ubuntu-latest diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 1d9570c..2ff63ca 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -2,9 +2,9 @@ name: Continuous Integration on: push: - branches: [ "main", "develop" ] + branches: [ "develop" ] pull_request: - branches: [ "main", "develop"] + branches: [ "develop" ] jobs: build-and-deploy: