diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 2aede3f8..87118b94 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -10,12 +10,12 @@ Please include a summary of the changes. Please delete options that are not relevant. -- [ ] Bug fix (non-breaking change which fixes an issue) -- [ ] New feature (non-breaking change which adds functionality) -- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) -- [ ] Documentation change (non-code changes affecting only the wiki) -- [ ] Infrastructure change (changes related to the github repo, build process, or the like) +- [] Bug fix (non-breaking change which fixes an issue) +- [] New feature (non-breaking change which adds functionality) +- [] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [] Documentation change (non-code changes affecting only the wiki) +- [] Infrastructure change (changes related to the github repo, build process, or the like) ## Checklist -- [ ] My code was submitted to the nightly branch of the repository. +- [] My code was submitted to the nightly branch of the repository. diff --git a/.github/workflows/merge-develop.yml b/.github/workflows/merge-develop.yml new file mode 100644 index 00000000..9979c658 --- /dev/null +++ b/.github/workflows/merge-develop.yml @@ -0,0 +1,27 @@ +name: Merge Nightly into Develop + +on: + workflow_dispatch: + +jobs: + merge-develop: + runs-on: ubuntu-latest + steps: + + - name: Create App Token + uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.APP_ID }} + private-key: ${{ secrets.APP_TOKEN }} + + - name: Check Out Repo + uses: actions/checkout@v4 + with: + token: ${{ steps.app-token.outputs.token }} + ref: nightly + fetch-depth: 0 + + - name: Push Nightly into Develop + run: | + git push origin refs/heads/nightly:refs/heads/develop diff --git a/.github/workflows/merge-master.yml b/.github/workflows/merge-master.yml new file mode 100644 index 00000000..7cf95be4 --- /dev/null +++ b/.github/workflows/merge-master.yml @@ -0,0 +1,27 @@ +name: Merge Develop into Master + +on: + workflow_dispatch: + +jobs: + merge-master: + runs-on: ubuntu-latest + steps: + + - name: Create App Token + uses: actions/create-github-app-token@v1 + id: app-token + with: + app-id: ${{ vars.APP_ID }} + private-key: ${{ secrets.APP_TOKEN }} + + - name: Check Out Repo + uses: actions/checkout@v4 + with: + token: ${{ steps.app-token.outputs.token }} + ref: develop + fetch-depth: 0 + + - name: Push Develop into Master + run: | + git push origin refs/heads/develop:refs/heads/master diff --git a/.github/workflows/spellcheck.yml b/.github/workflows/spellcheck.yml deleted file mode 100644 index e0e72102..00000000 --- a/.github/workflows/spellcheck.yml +++ /dev/null @@ -1,12 +0,0 @@ -name: Spellcheck Action - -on: pull_request - -jobs: - spellcheck: - runs-on: ubuntu-latest - steps: - - - uses: actions/checkout@v4 - - - uses: rojopolis/spellcheck-github-actions@0.36.0 \ No newline at end of file diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml new file mode 100644 index 00000000..5e06018b --- /dev/null +++ b/.github/workflows/validate.yml @@ -0,0 +1,27 @@ +name: Validate Pull Request + +on: pull_request + +jobs: + validate-pull: + runs-on: ubuntu-latest + steps: + + - name: Display Refs + run: | + echo "Base Repo: ${{ github.event.pull_request.base.repo.full_name }}" + echo "Base Ref: ${{ github.base_ref }}" + echo "Head Repo: ${{ github.event.pull_request.head.repo.full_name }}" + echo "Head Ref: ${{ github.head_ref }}" + + - name: Check Base Branch + if: github.base_ref == 'master' || github.base_ref == 'develop' + run: | + echo "ERROR: Pull Requests cannot be submitted to master or develop. Please submit the Pull Request to the nightly branch" + exit 1 + + - name: Checkout Repo + uses: actions/checkout@v4 + + - name: Run Spellcheck + uses: rojopolis/spellcheck-github-actions@0.36.0 \ No newline at end of file diff --git a/VERSION b/VERSION index 54ee0023..800e169b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.0.1-develop25 +2.0.1-develop26