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
47 changes: 0 additions & 47 deletions .github/workflows/automerge_driver_main_to_dev.yml

This file was deleted.

51 changes: 51 additions & 0 deletions .github/workflows/automerge_driver_release*_to_dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Auto Merge rel-* to dev branch (with submodules)

on:
push:
branches:
- rel-7.0.0-a.1

jobs:
merge:
runs-on: ubuntu-latest

steps:
- name: Checkout rel* branch
uses: actions/checkout@v3
with:
ref: rel-7.0.0-a.1
fetch-depth: 0
submodules: true
persist-credentials: false


- name: Configure Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Fetch dev-7.0.0-a-1 branch
run: |
git fetch origin dev-7.0.0-a-1 || echo "dev-7.0.0-a-1 does not exist yet"

- name: Checkout or create dev-7.0.0-a-1
run: |
if git show-ref --verify --quiet refs/remotes/origin/dev-7.0.0-a-1; then
git checkout -B dev-7.0.0-a-1 origin/dev-7.0.0-a-1
else
git checkout -b dev-7.0.0-a-1
fi

- name: Force replace dev branch with rel-7.0.0-a.1 branch contents (including submodules)
run: |
set -e
git reset --hard origin/rel-7.0.0-a.1
git submodule update --init --recursive
git add .
git commit -m "Force sync dev branch with rel-7.0.0-a.1 branch (including submodules)" || echo "No changes to commit"

- name: Push changes to dev
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
run: |
git push https://x-access-token:${GITHUB_TOKEN}@github.com/${{ github.repository }}.git dev-7.0.0-a-1 --force
Loading