Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/auto-merge-release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: Auto Merge Release

on:
workflow_dispatch:
inputs:
release-branch:
description: 'Target branch for release'
required: false
default: 'master'
type: string
pull_request:
types: [opened, synchronize, reopened, ready_for_review]

jobs:
release:
uses: tastyigniter/workflows/.github/workflows/auto-merge-release.yml@main
with:
release-branch: ${{ inputs.release-branch || 'master' }}
secrets:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
10 changes: 1 addition & 9 deletions .github/workflows/pipeline.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Orange CI Pipeline
name: CI Pipeline

on: [ push, workflow_dispatch ]

Expand All @@ -18,11 +18,3 @@ jobs:
uses: tastyigniter/workflows/.github/workflows/php-tests.yml@main
with:
php-version: ${{ matrix.php }}

auto-merge-release:
needs: [ php-tests ]
uses: tastyigniter/workflows/.github/workflows/auto-merge-release.yml@main
with:
release-branch: master
secrets:
ACCESS_TOKEN: ${{ secrets.ACCESS_TOKEN }}
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,10 @@
"test:coverage": "vendor/bin/pest --coverage --exactly=100 --compact",
"test:type-coverage": "vendor/bin/pest --type-coverage --min=100",
"test": [
"@test:lint",
"@test:refactor",
"@test:static",
"@test:lint",
"@test:coverage"
]
}
}
}
Loading