Skip to content

Commit

Permalink
Switch references to develop branch to main (#1080)
Browse files Browse the repository at this point in the history
  • Loading branch information
marrobi authored Nov 25, 2021
1 parent 4c18c1a commit be54724
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 14 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/build_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ name: Docker build

on:
pull_request:
branches: [main]
pull_request_target:
types: [labeled]
branches: [develop]
branches: [main]
workflow_dispatch:

# for each ref (branch/pr) run just the most recent, cancel other pending/running ones
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Publish docs via Github Pages

on:
push:
branches: [develop, main]
branches: [main]

jobs:
build:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_validation_develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: Build Validation

on:
pull_request:
branches: [develop, main]
branches: [main]
pull_request_target:
types: [labeled]
branches: [develop]
branches: [main]

# for each ref (branch/pr) run just the most recent, cancel other pending/running ones
concurrency:
Expand All @@ -31,7 +31,7 @@ jobs:
uses: github/super-linter@v4
env:
VALIDATE_ALL_CODEBASE: false
DEFAULT_BRANCH: develop
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
VALIDATE_MARKDOWN: true
VALIDATE_PYTHON_FLAKE8: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ name: "CodeQL"

on:
push:
branches: [main, develop]
branches: [main]
pull_request:
branches: [main, develop]
branches: [main]
pull_request_target:
types: [labeled]
branches: [develop]
branches: [main]
schedule:
- cron: '41 3 * * 5'

Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/deploy_tre.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ on:
# 1am each night https://crontab.guru/#0_1_*_*_*
- cron: "0 1 * * *"
push:
branches: [develop, main]
branches: [main]
pull_request_target:
types: [labeled]
branches: [develop]
branches: [main]
workflow_dispatch:

# This will prevent multiple runs of this entire workflow.
Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:
- name: Notify dedicated teams channel
uses: sachinkundu/[email protected]
if: ${{ failure() && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main') }}
if: ${{ failure() && github.ref == 'refs/heads/main' }}
with:
github-token: ${{ github.token }}
ms-teams-webhook-uri: ${{ secrets.MS_TEAMS_WEBHOOK_URI }}
Expand Down Expand Up @@ -216,7 +216,7 @@ jobs:
- name: Notify dedicated teams channel
uses: sachinkundu/[email protected]
if: ${{ failure() && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main') }}
if: ${{ failure() && github.ref == 'refs/heads/main'}}
continue-on-error: true
with:
github-token: ${{ github.token }}
Expand All @@ -235,7 +235,7 @@ jobs:
- name: Notify dedicated teams channel
uses: sachinkundu/[email protected]
if: ${{ success() && (github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/main') }}
if: ${{ success() && github.ref == 'refs/heads/main' }}
continue-on-error: true
with:
github-token: ${{ github.token }}
Expand Down
2 changes: 1 addition & 1 deletion docs/tre-admins/setup-instructions/workflows.md
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ However, changes reviewed and found safe should be able to execute workflows. A
on:
pull_request_target:
types: [labeled]
branches: [develop]
branches: [main]

jobs:
my_job:
Expand Down

0 comments on commit be54724

Please sign in to comment.