Skip to content

Commit

Permalink
Merge pull request #14 from mhitza/fix-default-branch
Browse files Browse the repository at this point in the history
chore: fix default branch #8308
  • Loading branch information
CesarScur authored Dec 29, 2023
2 parents dee196f + 1b6d17c commit 87b422d
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/settings.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ repository:
has_downloads: true

# Updates the default branch for this repository.
default_branch: main
default_branch: master

# Either `true` to allow squash-merging pull requests, or `false` to prevent
# squash-merging.
Expand Down
17 changes: 13 additions & 4 deletions .github/workflows/repo-ansible.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: repo-ansible

on:
workflow_dispatch:

pull_request_target:
paths:
- 'repo.yaml'
Expand All @@ -23,10 +25,16 @@ jobs:
run:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- if: ${{ env.IS_PULL_REQUEST == '0' }}
uses: actions/checkout@v4
with:
path: current
ref: ${{ github.event_name == 'pull_request_target' && github.head_ref || '' }}

- if: ${{ env.IS_PULL_REQUEST == '1' }}
uses: actions/checkout@v4
with:
path: current
ref: refs/pull/${{ github.event.pull_request.number }}/merge

- uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -67,8 +75,9 @@ jobs:
git config user.name github-actions
git config user.email [email protected]
git add .
git commit -m "chore: repo-ansible run"
git push
if git commit -m "chore: repo-ansible run"; then
git push
fi
- if: ${{ env.IS_PULL_REQUEST == '1' && env.REPOSITORY_CHANGED == '1' }}
Expand Down
1 change: 1 addition & 0 deletions repo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ name: envoi
type: library
visibility: public
github:
default_branch: master
features:
issues: true

Expand Down

0 comments on commit 87b422d

Please sign in to comment.