diff --git a/.github/NOTIFIED b/.github/NOTIFIED index aabd416..359c545 100644 --- a/.github/NOTIFIED +++ b/.github/NOTIFIED @@ -17,3 +17,4 @@ Be sure to read through .github/Gerald-README.md before adding any rules! # This is analogous to Herald's "Differential Revision is False" condition. **/* @yipstanley + diff --git a/.github/workflows/gerald-pr.yml b/.github/workflows/gerald-pr.yml index 5ee1f1c..31ad81e 100644 --- a/.github/workflows/gerald-pr.yml +++ b/.github/workflows/gerald-pr.yml @@ -2,7 +2,6 @@ name: Gerald - Notify and Request Reviewers On Pull Request on: pull_request: issue_comment: - types: [created] jobs: gerald: runs-on: ubuntu-latest diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml new file mode 100644 index 0000000..fbc383e --- /dev/null +++ b/.github/workflows/test.yml @@ -0,0 +1,21 @@ +name: TEST +on: + issue_comment: +jobs: + gerald: + runs-on: ubuntu-latest + steps: + - name: Check out base branch + uses: actions/checkout@v2 + with: + ref: '${{ github.base_ref }}' + - name: Check out head branch + uses: actions/checkout@v2 + with: + ref: '${{ github.head_ref }}' + - name: Run Gerald + uses: Khan/gerald@debug + env: + GITHUB_TOKEN: '${{ secrets.GITHUB_TOKEN }}' + ADMIN_PERMISSION_TOKEN: '${{ secrets.KHAN_ACTIONS_BOT_TOKEN }}' + EVENT: 'pull_request' \ No newline at end of file diff --git a/src/utils.js b/src/utils.js index 3d0aa35..2d22a72 100644 --- a/src/utils.js +++ b/src/utils.js @@ -421,7 +421,4 @@ export const __maybeAddIfMatch = maybeAddIfMatch; export const __turnPatternIntoRegex = turnPatternIntoRegex; export const __parseUsername = parseUsername; export const __pushOrSetToBin = pushOrSetToBin; -<<<<<<< HEAD export const __filterIgnoreFiles = filterIgnoreFiles; -======= ->>>>>>> Automated build push