diff --git a/.github/workflows/internal_vs_external.yml b/.github/workflows/internal_vs_external.yml index a5b0459..a64031d 100644 --- a/.github/workflows/internal_vs_external.yml +++ b/.github/workflows/internal_vs_external.yml @@ -3,46 +3,50 @@ name: Internal vs External Review on: - workflow_call: + pull_request: + types: + - ready_for_review + - synchronize + merge_group: # merge group is always needed for a required workflows to prevent them from getting stuck, but we then skip it below jobs: - check-membership: - name: Check Membership - runs-on: ubuntu-latest - # Dont run this workflow on merge queue - if: ${{ github.event_name != 'merge_group' }} - outputs: - is_member: ${{ steps.check-membership.outputs.is_member}} - steps: - - name: Create GitHub App Token - uses: actions/create-github-app-token@v1 - id: app-token - with: - app-id: ${{ vars.CLA_BOT_APP_ID }} - private-key: ${{ secrets.CLA_BOT_PRIVATE_KEY }} + # check-membership: + # name: Check Membership + # runs-on: ubuntu-latest + # # Dont run this workflow on merge queue + # if: ${{ github.event_name != 'merge_group' }} + # outputs: + # is_member: ${{ steps.check-membership.outputs.is_member}} + # steps: + # - name: Create GitHub App Token + # uses: actions/create-github-app-token@v1 + # id: app-token + # with: + # app-id: ${{ vars.CLA_BOT_APP_ID }} + # private-key: ${{ secrets.CLA_BOT_PRIVATE_KEY }} - - name: Checkout - uses: actions/checkout@v4 - with: - repository: 'dfinity/public-workflows' + # - name: Checkout + # uses: actions/checkout@v4 + # with: + # repository: 'dfinity/public-workflows' - - name: Python Setup - uses: ./.github/workflows/python-setup + # - name: Python Setup + # uses: ./.github/workflows/python-setup - - name: Check Membership - id: check-membership - run: python reusable_workflows/check_membership/check_membership.py - shell: bash - env: - GH_TOKEN: ${{ steps.app-token.outputs.token }} - GH_ORG: ${{ github.repository_owner }} - USER: ${{ github.event.pull_request.user.login }} + # - name: Check Membership + # id: check-membership + # run: python reusable_workflows/check_membership/check_membership.py + # shell: bash + # env: + # GH_TOKEN: ${{ steps.app-token.outputs.token }} + # GH_ORG: ${{ github.repository_owner }} + # USER: ${{ github.event.pull_request.user.login }} revoke-approvals: name: Revoke Approvals runs-on: ubuntu-latest needs: check-membership - if: ${{ needs.check-membership.outputs.is_member != 'true' && needs.check-membership.result == 'success' }} + # if: ${{ needs.check-membership.outputs.is_member != 'true' && needs.check-membership.result == 'success' }} steps: - name: Create GitHub App Token uses: actions/create-github-app-token@v1