mirror of
https://github.com/ansible/awx.git
synced 2026-01-09 23:12:08 -03:30
36ec5efc88
* the workflow has been failing silently without catching a merge conflict. this removes the fail pretty logic previously implemented. * just fail if a merge conflict is encountered
36 lines
944 B
YAML
36 lines
944 B
YAML
name: Rebase release_4.6-next and stable-2.6
|
|
|
|
on:
|
|
push:
|
|
branches:
|
|
- release_4.6
|
|
workflow_dispatch:
|
|
# Allows manual triggering of the workflow from the GitHub UI
|
|
|
|
jobs:
|
|
rebase:
|
|
runs-on: ubuntu-latest
|
|
permissions:
|
|
contents: write
|
|
steps:
|
|
- name: Checkout stable-2.6 branch
|
|
uses: actions/checkout@v4
|
|
with:
|
|
ref: stable-2.6
|
|
token: ${{ secrets.GITHUB_TOKEN }}
|
|
|
|
- name: Fetch release_4.6 branch for rebase
|
|
run: git fetch origin release_4.6:release_4.6
|
|
|
|
- name: Attempt Rebase release_4.6 into stable-2.6
|
|
id: rebase_attempt
|
|
run: |
|
|
git config user.name "GitHub Actions"
|
|
git config user.email "github-actions[bot]@users.noreply.github.com"
|
|
git checkout stable-2.6
|
|
git rebase release_4.6
|
|
|
|
- name: Force Push Rebased stable-2.6 Branch
|
|
run: |
|
|
git push --force origin stable-2.6
|