diff --git a/.github/workflows/merge-develop-to-scaffold.yml b/.github/workflows/merge-develop-to-scaffold.yml deleted file mode 100644 index 4f6b2f22..00000000 --- a/.github/workflows/merge-develop-to-scaffold.yml +++ /dev/null @@ -1,40 +0,0 @@ -# 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 "$GITHUB_ACTOR@users.noreply.github.com" - - echo "Cloning alleyinteractive/create-wordpress-plugin..." - git clone --recursive --quiet https://$TOKEN@github.com/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 diff --git a/configure.php b/configure.php index 71d36662..10b7d476 100644 --- a/configure.php +++ b/configure.php @@ -426,10 +426,6 @@ function enable_sqlite_testing(): void { echo "\nWelcome friend to alleyinteractive/create-wordpress-plugin! 😀\nLet's setup your WordPress Plugin 🚀\n\n"; -// Always delete the 'merge-develop-to-scaffold.yml' file (this is never used in -// a scaffolded plugins). -delete_files( '.github/workflows/merge-develop-to-scaffold.yml' ); - $current_dir = getcwd(); if ( ! $current_dir ) { diff --git a/package.json b/package.json index 9f381f80..6efe512a 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "pretest": "check-node-version --package", "prerelease": "check-node-version --package", "release": "npx @alleyinteractive/create-release@latest", + "scaffold": "npx @alleyinteractive/scaffolder@latest", "start": "alley-build start", "start:hot": "alley-build start --hot", "stylelint:fix": "stylelint --fix \"**/*.scss\"",