Merge pull request #18 from dfinity/change-env-var-name

Change env var name
dfinity · Oct 13, 2023 · ddeb188 · ddeb188
2 parents 518486b + e6ef3fb
commit ddeb188
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/check_cla.yml b/.github/workflows/check_cla.yml
@@ -43,7 +43,7 @@ jobs:
         run: python reusable_workflows/check_membership/check_membership.py
         shell: bash
         env:
-          GITHUB_TOKEN: ${{ secrets.CLA_READ_ORG_MEMBERSHIP }}
+          GH_TOKEN: ${{ secrets.CLA_READ_ORG_MEMBERSHIP }}
           GH_ORG: ${{ github.repository_owner }}
           USER: ${{ github.event.pull_request.user.login }}
 
@@ -73,7 +73,7 @@ jobs:
           python reusable_workflows/check_membership/check_external_contrib.py
         shell: bash
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ github.token }}
           REPO: ${{ github.event.repository.name }}
 
       - name: Checkout
@@ -90,7 +90,7 @@ jobs:
           — The DFINITY Foundation"
           gh pr close ${{ github.event.number }} --comment "$message"
         env:
-          GITHUB_TOKEN: ${{ github.token }}
+          GH_TOKEN: ${{ github.token }}
 
       - name: Add Label
         uses: actions-ecosystem/action-add-labels@v1

diff --git a/reusable_workflows/check_membership/check_membership.py b/reusable_workflows/check_membership/check_membership.py
@@ -12,7 +12,7 @@ def is_member_of_org(gh: github3.login, org: str, user: str) -> bool:
 
 def main() -> None:
     org = os.environ["GH_ORG"]
-    gh_token = os.environ["GITHUB_TOKEN"]
+    gh_token = os.environ["GH_TOKEN"]
     user = os.environ["USER"]
 
     gh = github3.login(token=gh_token)

diff --git a/reusable_workflows/tests/test_membership.py b/reusable_workflows/tests/test_membership.py
@@ -30,7 +30,7 @@ def test_not_member():
 
 
 @mock.patch.dict(
-    os.environ, {"GH_ORG": "my_org", "GITHUB_TOKEN": "secret", "USER": "username"}
+    os.environ, {"GH_ORG": "my_org", "GH_TOKEN": "secret", "USER": "username"}
 )
 @mock.patch("github3.login")
 @mock.patch("os.system")
@@ -52,7 +52,7 @@ def test_end_to_end_is_member(os_system, github_login_mock, capfd):
 
 
 @mock.patch.dict(
-    os.environ, {"GH_ORG": "my_org", "GITHUB_TOKEN": "secret", "USER": "username"}
+    os.environ, {"GH_ORG": "my_org", "GH_TOKEN": "secret", "USER": "username"}
 )
 @mock.patch("github3.login")
 @mock.patch("os.system")
@@ -74,7 +74,7 @@ def test_end_to_end_is_not_member(os_system, github_login_mock, capfd):
 
 
 @mock.patch.dict(
-    os.environ, {"GH_ORG": "my_org", "GITHUB_TOKEN": "secret", "USER": "username"}
+    os.environ, {"GH_ORG": "my_org", "GH_TOKEN": "secret", "USER": "username"}
 )
 @mock.patch("github3.login")
 @mock.patch("os.system")
@@ -91,7 +91,7 @@ def test_end_to_end_api_fails(os_system, github_login_mock):
 
 
 @mock.patch.dict(
-    os.environ, {"GH_ORG": "my_org", "GITHUB_TOKEN": "", "USER": "username"}
+    os.environ, {"GH_ORG": "my_org", "GH_TOKEN": "", "USER": "username"}
 )
 @mock.patch("github3.login")
 def test_github_token_not_passed_in(github_login_mock):