-
Notifications
You must be signed in to change notification settings - Fork 4
40 lines (32 loc) · 1.31 KB
/
merge-develop-to-scaffold.yml
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
# This workflow is used on alleyinteractive/create-wordpress-plugin to merge the
# develop branch into the scaffold branch and is NOT meant to be used on other
# repositories. This workflow will be deleted automatically when the
# configuration script is run.
name: Merge Develop to Scaffold Branch
on:
push:
branches:
- develop
- remove-scaffold
jobs:
merge-develop-to-scaffold:
name: merge develop to scaffold
if: ${{ github.repository == 'alleyinteractive/create-wordpress-plugin' }}
runs-on: ubuntu-latest
steps:
- name: Merge develop to scaffold
shell: bash
env:
DEVELOP_BRANCH: develop
SCAFFOLD_BRANCH: scaffold
TOKEN: ${{ secrets.GH_TOKEN }}
run: |
git config --global user.name "$GITHUB_ACTOR"
git config --global user.email "[email protected]"
echo "Cloning alleyinteractive/create-wordpress-plugin..."
git clone --recursive --quiet https://[email protected]/alleyinteractive/create-wordpress-plugin.git create-wordpress-plugin -b $SCAFFOLD_BRANCH
cd create-wordpress-plugin
git fetch origin $DEVELOP_BRANCH
git fetch origin $SCAFFOLD_BRANCH
git merge origin/$DEVELOP_BRANCH --no-edit
git push -u origin $SCAFFOLD_BRANCH