Skip to content

Commit

Permalink
Merge branch 'main' into move_infra_folder
Browse files Browse the repository at this point in the history
  • Loading branch information
ifosch authored Oct 23, 2023
2 parents 4654e3e + 15ee248 commit 2779978
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# the repo. Unless a later match takes precedence,
# @global-owner1 and @global-owner2 will be requested for
# review when someone opens a pull request.
* @agustibr
#* @agustibr

# Order is important; the last matching pattern takes the most
# precedence. When someone opens a pull request that only
Expand Down
15 changes: 0 additions & 15 deletions .github/workflows/action-wip-blocker.yml

This file was deleted.

38 changes: 38 additions & 0 deletions .github/workflows/automerge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: automerge
on:
pull_request:
types:
- labeled
- unlabeled
- synchronize
- opened
- edited
- ready_for_review
- reopened
- unlocked
pull_request_review:
types:
- submitted
check_suite:
types:
- completed
status: {}

permissions:
pull-requests: write
contents: write
issues: write
repository-projects: read

jobs:
automerge:
runs-on: ubuntu-latest
steps:
- id: automerge
name: automerge
uses: "pascalgn/[email protected]"
env:
MERGE_LABELS: "!Block"
UPDATE_LABELS: ""
MERGE_METHOD: "rebase"
GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# plus_pull_replacement

Hackdays@Devex code review
Hackdays@Devex code review test

## Plus Pull

Expand Down

0 comments on commit 2779978

Please sign in to comment.