Skip to content

Commit

Permalink
Merge pull request #121 from Lnaden/gh-main-master
Browse files Browse the repository at this point in the history
Allow GitHub Actions to run on both "master" and "main"
  • Loading branch information
Lnaden authored Oct 28, 2020
2 parents 9c0fe5c + 9e09ff9 commit 73d506d
Show file tree
Hide file tree
Showing 14 changed files with 70 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_1_1_3_1.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_1_1_3_2.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_1_2_3_1.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_1_2_3_2.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_1_3_3_1.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_1_3_3_2.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_2_1_3_1.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_2_1_3_2.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_2_2_3_1.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_2_2_3_2.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_2_3_3_1.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/reference-workflows/CI_2_3_3_2.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions .github/workflows/verify-ghas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,17 @@ name: Pseudo Validate GHA Output

# Approximation of the GHA "on" block
on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down
5 changes: 5 additions & 0 deletions {{cookiecutter.repo_name}}/.github/workflows/CI.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
name: CI

on:
# GitHub has started calling new repo's first branch "main" https://github.com/github/renaming
# Existing codes likely still have "master" as the primary branch
# Both are tracked here to keep legacy and new codes working
push:
branches:
- "master"
- "main"
pull_request:
branches:
- "master"
- "main"
schedule:
# Nightly tests run on master by default:
# Scheduled workflows run on the latest commit on the default or base branch.
Expand Down

0 comments on commit 73d506d

Please sign in to comment.