Compare commits
2 Commits
3830d32c67
...
b43cdeba18
| Author | SHA1 | Date | |
|---|---|---|---|
| b43cdeba18 | |||
| bde7552ae1 |
@@ -34,7 +34,7 @@ jobs:
|
|||||||
if: >-
|
if: >-
|
||||||
github.event_name == 'schedule' ||
|
github.event_name == 'schedule' ||
|
||||||
github.event_name == 'workflow_dispatch' ||
|
github.event_name == 'workflow_dispatch' ||
|
||||||
(github.event_name == 'push' && github.actor != 'renovate-bot' && !startsWith(github.event.head_commit.message, 'Merge pull request')) ||
|
(github.event_name == 'push' && github.actor != 'renovate-bot' && !startsWith(github.event.head_commit.message, 'Merge pull request') && !contains(github.event.head_commit.message, '(#')) ||
|
||||||
(github.event_name == 'pull_request' && github.event.pull_request.merged == true)
|
(github.event_name == 'pull_request' && github.event.pull_request.merged == true)
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Main
|
- name: Checkout Main
|
||||||
@@ -111,6 +111,7 @@ jobs:
|
|||||||
- name: Prepare Manifest Branch
|
- name: Prepare Manifest Branch
|
||||||
id: prepare-manifest-branch
|
id: prepare-manifest-branch
|
||||||
env:
|
env:
|
||||||
|
PR_NUMBER: ${{ github.event.pull_request.number }}
|
||||||
IS_AUTOMERGE: ${{ steps.mode.outputs.is-automerge }}
|
IS_AUTOMERGE: ${{ steps.mode.outputs.is-automerge }}
|
||||||
run: |
|
run: |
|
||||||
cd "${MANIFEST_DIR}"
|
cd "${MANIFEST_DIR}"
|
||||||
@@ -120,10 +121,10 @@ jobs:
|
|||||||
git config user.email "gitea-bot@alexlebens.net"
|
git config user.email "gitea-bot@alexlebens.net"
|
||||||
|
|
||||||
if [[ "$IS_AUTOMERGE" == "true" ]]; then
|
if [[ "$IS_AUTOMERGE" == "true" ]]; then
|
||||||
|
BRANCH_NAME="${BRANCH_NAME_BASE}-automerge-${PR_NUMBER}"
|
||||||
echo ""
|
echo ""
|
||||||
echo ">> Creating branch ${BRANCH_NAME} ..."
|
echo ">> Creating branch ${BRANCH_NAME} ..."
|
||||||
BRANCH_NAME="${BRANCH_NAME_BASE}-automerge-$(date +%Y%m%d%H%M%S)"
|
git checkout -B "$BRANCH_NAME"
|
||||||
git checkout -b "$BRANCH_NAME"
|
|
||||||
|
|
||||||
else
|
else
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
Reference in New Issue
Block a user