From cd33d56f45c760b33015e59c7f445bad5bed33eb Mon Sep 17 00:00:00 2001 From: Norman Maurer Date: Tue, 22 Dec 2020 19:30:57 +0100 Subject: [PATCH] Only use build and deploy workflows for 4.1 for now --- .github/workflows/ci-build.yml | 10 +++++----- .github/workflows/ci-deploy.yml | 2 +- .github/workflows/codeql-analysis.yml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml index 688976fd01..687eeec8e5 100644 --- a/.github/workflows/ci-build.yml +++ b/.github/workflows/ci-build.yml @@ -2,9 +2,9 @@ name: Build project on: push: - branches: [ "4.1", master ] + branches: [ "4.1"] pull_request: - branches: [ "4.1", master ] + branches: [ "4.1"] schedule: - cron: '30 1 * * 1' # At 01:30 on Monday, every Monday. @@ -58,7 +58,7 @@ jobs: run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml build - name: Build project without leak detection - if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/4.1') }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/4.1' }} run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.18.yaml run build - name: Build project with leak detection @@ -107,7 +107,7 @@ jobs: run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml build - name: Build project without leak detection - if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/4.1') }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/4.1' }} run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.111.yaml run build - name: Build project with leak detection @@ -156,7 +156,7 @@ jobs: run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.115.yaml build - name: Build project without leak detection - if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/4.1') }} + if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/4.1' }} run: docker-compose -f docker/docker-compose.yaml -f docker/docker-compose.centos-6.115.yaml run build - name: Build project with leak detection diff --git a/.github/workflows/ci-deploy.yml b/.github/workflows/ci-deploy.yml index cdaab60e6e..aeee68f268 100644 --- a/.github/workflows/ci-deploy.yml +++ b/.github/workflows/ci-deploy.yml @@ -2,7 +2,7 @@ name: Deploy project on: push: - branches: [ "4.1", master ] + branches: [ "4.1" ] schedule: - cron: '30 1 * * 1' # At 01:30 on Monday, every Monday. diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 15dc30b5be..a987232292 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -7,10 +7,10 @@ name: "CodeQL" on: push: - branches: [4.1, master] + branches: ["4.1", master] pull_request: # The branches below must be a subset of the branches above - branches: [4.1, master] + branches: ["4.1", master] schedule: - cron: '0 13 * * 3'