diff --git a/.github/workflows/label-conflict.yml b/.github/workflows/label-conflict.yml deleted file mode 100644 index c24e232c..00000000 --- a/.github/workflows/label-conflict.yml +++ /dev/null @@ -1,19 +0,0 @@ -name: "Maintenance" -on: - push: - branches: - - main - pull_request: - types: [synchronize] - -jobs: - main: - runs-on: ubuntu-latest - steps: - - name: check if prs are dirty - uses: eps1lon/actions-label-merge-conflict@releases/2.x - with: - dirtyLabel: "PR: needs rebase" - repoToken: "${{ secrets.GITHUB_TOKEN }}" - commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request." - commentOnClean: "Conflicts have been resolved." diff --git a/.github/workflows/rebase.yml b/.github/workflows/rebase.yml deleted file mode 100644 index 602aff34..00000000 --- a/.github/workflows/rebase.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Automatic Rebase -on: - issue_comment: - types: [created] -jobs: - rebase: - name: Rebase - if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/rebase') - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3.0.0 - with: - token: ${{ secrets.PAT_TOKEN }} - fetch-depth: 0 # otherwise, you will failed to push refs to dest repo - - name: Automatic Rebase - uses: cirrus-actions/rebase@1.5 - env: - GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }} diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2764e6bd..58fb1682 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -517,7 +517,7 @@ jobs: test/changed-files-list.txt test/changed-files-list.txt files: | - **/workflows/rebase.yml + **/workflows/greetings.yml - name: Check if a excluded file is not included in any_changed if: contains(steps.changed-files-specific-source-file.outputs.all_changed_files, 'test/test/test.txt') run: | @@ -530,7 +530,7 @@ jobs: ( !contains(steps.changed-files-specific-source-file.outputs.all_changed_files, 'action.yml') && !contains(steps.changed-files-specific-source-file.outputs.all_changed_files, '.github/workflows/test.yml') && - !contains(steps.changed-files-specific-source-file.outputs.all_changed_files, '.github/workflows/rebase.yml') && + !contains(steps.changed-files-specific-source-file.outputs.all_changed_files, '.github/workflows/greetings.yml') && !contains(steps.changed-files-specific-source-file.outputs.all_changed_files, 'test/test.txt') ) run: | @@ -552,7 +552,7 @@ jobs: ( !contains(steps.changed-files-specific-source-file.outputs.all_modified_files, 'action.yml') && !contains(steps.changed-files-specific-source-file.outputs.all_modified_files, '.github/workflows/test.yml') && - !contains(steps.changed-files-specific-source-file.outputs.all_modified_files, '.github/workflows/rebase.yml') && + !contains(steps.changed-files-specific-source-file.outputs.all_modified_files, '.github/workflows/greetings.yml') && !contains(steps.changed-files-specific-source-file.outputs.all_modified_files, 'test/test.txt') ) run: |