Skip to content

Commit

Permalink
[26] update PR actions
Browse files Browse the repository at this point in the history
  • Loading branch information
meisnate12 committed May 28, 2024
1 parent 5a1b9d4 commit fd97fd7
Show file tree
Hide file tree
Showing 6 changed files with 88 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
27 changes: 27 additions & 0 deletions .github/workflows/merge-develop.yml
Original file line number Diff line number Diff line change
@@ -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
27 changes: 27 additions & 0 deletions .github/workflows/merge-master.yml
Original file line number Diff line number Diff line change
@@ -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
12 changes: 0 additions & 12 deletions .github/workflows/spellcheck.yml

This file was deleted.

27 changes: 27 additions & 0 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1-develop25
2.0.1-develop26

0 comments on commit fd97fd7

Please sign in to comment.