Merge pull request #3 from dfinity/fix-workflow

Update check_cla.yml
dfinity · Sep 5, 2023 · 600c89d · 600c89d
2 parents 6e32c3c + d23889f
commit 600c89d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/.github/workflows/check_cla.yml b/.github/workflows/check_cla.yml
@@ -17,18 +17,18 @@ jobs:
   check-membership:
     name: Check Membership
     runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'github-actions[bot]' && github.event_name != 'pull_request' }} 
+    if: ${{ github.event.pull_request.user.login != 'dependabot[bot]' && github.event.pull_request.user.login != 'github-actions[bot]' }} 
     outputs:
       is_member: ${{ steps.check-membership.outputs.is_member}}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
         with:
-          repository: 'dfinity/repositories-open-to-contributions'
+          repository: 'dfinity/internal-workflows'
 
       - name: Check Membership
         id:  check-membership
-        uses: ./reusable_workflows/check_membership/
+        uses: ./reusable_workflows/check_membership/check_membership/
         with:
           github-token: ${{ secrets.CLA_READ_ORG_MEMBERSHIP }}
 
@@ -44,7 +44,7 @@ jobs:
           repository: 'dfinity/repositories-open-to-contributions'
       - name: Check if accepting external contributions
         id: accepts_external_contrib
-        uses: ./reusable_workflows/check_external_contrib/
+        uses: ./reusable_workflows/check_membership/check_external_contrib/
 
       - name: Checkout
         uses: actions/checkout@v3
@@ -76,7 +76,7 @@ jobs:
 
       - name: Check CLA
         id:  check-cla
-        uses: ./reusable_workflows/check_cla_pr/
+        uses: ./reusable_workflows/check_cla/check_cla_pr/
         if: ${{ steps.accepts_external_contrib.outputs.accepts_contrib != 'false' }}
         with:
-          github-token: ${{ secrets.CLA_COMMENT_ON_PRS }}
+          github-token: ${{ secrets.CLA_COMMENT_ON_PRS }}
diff --git a/reusable_workflows/check_cla/check_cla_issue/action.yml b/reusable_workflows/check_cla/check_cla_issue/action.yml
@@ -23,7 +23,7 @@ runs:
       shell: bash
     - name: Check CLA
       id: check_cla
-      run: python .github/custom_python_actions/check_cla_issue.py
+      run: python reusable_workflows/check_cla/check_cla_issue/check_cla_issue.py
       shell: bash
       env:
         GH_TOKEN: ${{ inputs.github-token }}

diff --git a/reusable_workflows/check_cla/check_cla_pr/action.yml b/reusable_workflows/check_cla/check_cla_pr/action.yml
@@ -30,7 +30,7 @@ runs:
       shell: bash
     - name: Check CLA
       id: check_cla
-      run: python .github/custom_python_actions/check_cla_pr.py
+      run: python reusable_workflows/check_cla/check_cla_pr/check_cla_pr.py
       shell: bash
       env:
         GH_ORG: ${{ inputs.org }}

diff --git a/reusable_workflows/check_membership/check_external_contrib/action.yml b/reusable_workflows/check_membership/check_external_contrib/action.yml
@@ -26,8 +26,8 @@ runs:
       shell: bash
     - name: Check External Contribution
       id: check-external-contrib
-      run: python .github/custom_python_actions/check_external_contrib.py
+      run: python reusable_workflows/check_membership/check_external_contrib/check_external_contrib.py
       shell: bash
       env:
         REPO: ${{ inputs.repo-name }}
-        GH_TOKEN: ${{ inputs.github-token }}
+        GH_TOKEN: ${{ inputs.github-token }}
diff --git a/reusable_workflows/check_membership/check_membership/action.yml b/reusable_workflows/check_membership/check_membership/action.yml
@@ -30,7 +30,7 @@ runs:
       shell: bash
     - name: Check Membership
       id: check-membership
-      run: python .github/custom_python_actions/check_membership.py
+      run: python reusable_workflows/check_membership/check_membership/check_membership.py
       shell: bash
       env:
         GH_ORG: ${{ inputs.org }}

diff --git a/reusable_workflows/compliance/check_compliance/action.yml b/reusable_workflows/compliance/check_compliance/action.yml
@@ -25,7 +25,7 @@ runs:
       shell: bash
     - name: Check Compliance
       id: check_compliance
-      run: python .github/custom_python_actions/check_compliance.py
+      run: python reusable_workflows/compliance/check_compliance/check_compliance.py
       shell: bash
       env:
         GH_ORG: ${{ inputs.org }}