Skip to content

bringing in most of existing code #2

bringing in most of existing code

bringing in most of existing code #2

name: Merge Develop to Scaffold Branch
on:
push:
branches:
- develop
- remove-scaffold
jobs:
merge-develop-to-scaffold:
name: merge develop to scaffold
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