Skip to content

Commit

Permalink
fix: use either main or master branch for trigger
Browse files Browse the repository at this point in the history
  • Loading branch information
papanito committed Aug 5, 2023
1 parent 62a90c6 commit 1c04db3
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
14 changes: 14 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# Github Actions Workflow Templates

This is my collection of shared github actions workflows I use for my projects.

For Ansible Galaxy you may want to set `github_branch` to main if you don't use the `master` in `meta/main.yml`:

```yaml
galaxy_info:

# Optionally specify the branch Galaxy will use when accessing the GitHub
# repo for this role. During role install, if no tags are available,
# Galaxy will use this branch. During import Galaxy will access files on
# this branch. If Travis integration is configured, only notifications for this
# branch will be accepted. Otherwise, in all cases, the repo's default branch
# (usually master) will be used.
github_branch: main
```
8 changes: 5 additions & 3 deletions ansible-roles/build.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
name: master and pr builds
name: main and pr builds

on:
push:
branches:
branches:
- master
- main
pull_request:
branches:
branches:
- master
- main
workflow_dispatch:

jobs:
Expand Down

0 comments on commit 1c04db3

Please sign in to comment.