From 15addfefd650571cec293ecfee5086324b66b444 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 4 Mar 2022 15:52:37 +0000 Subject: [PATCH 1/8] Rename the output --- .github/workflows/preDeploy.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index f4080ce15395..402be4c69333 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -213,7 +213,7 @@ jobs: runs-on: ubuntu-latest outputs: - isExpensifyEmployee: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} + IS_EXPENSIFY_EMPLOYEE: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} steps: - name: Check whether the actor is member of expensify-expensify team @@ -227,7 +227,7 @@ jobs: newContributorWelcomeMessage: runs-on: ubuntu-latest needs: isExpensifyEmployee - if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.isExpensifyEmployee) }} + if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }} steps: # Version: 2.3.4 - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f From 78c8b3d1a2dc3495fd6e8e13a388e26140ebf9d9 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 4 Mar 2022 17:34:45 +0000 Subject: [PATCH 2/8] Check for engineering team --- .github/workflows/preDeploy.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index 402be4c69333..4d0d185db8c4 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -208,7 +208,7 @@ jobs: GITHUB_TOKEN: ${{ github.token }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - # Check if actor is member of Expensify organization by looking for expensify-expensify team + # Check if actor is member of Expensify organization by looking for engineering team isExpensifyEmployee: runs-on: ubuntu-latest @@ -216,13 +216,13 @@ jobs: IS_EXPENSIFY_EMPLOYEE: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} steps: - - name: Check whether the actor is member of expensify-expensify team + - name: Check whether the actor is member of engineering team id: checkActor uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872 with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} username: ${{ github.actor }} - team: expensify-expensify + team: engineering newContributorWelcomeMessage: runs-on: ubuntu-latest From 8e80a485ea89a35018058834359415f37d849af4 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 4 Mar 2022 17:49:51 +0000 Subject: [PATCH 3/8] Forgot to save the previous changes --- .github/workflows/preDeploy.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index 4d0d185db8c4..29c20817a7be 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -209,11 +209,11 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} # Check if actor is member of Expensify organization by looking for engineering team - isExpensifyEmployee: + isExpensifyEngineer: runs-on: ubuntu-latest outputs: - IS_EXPENSIFY_EMPLOYEE: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} + IS_EXPENSIFY_ENGINEER: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} steps: - name: Check whether the actor is member of engineering team @@ -226,8 +226,8 @@ jobs: newContributorWelcomeMessage: runs-on: ubuntu-latest - needs: isExpensifyEmployee - if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }} + needs: isExpensifyEngineer + if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEngineer.outputs.IS_EXPENSIFY_ENGINEER) }} steps: # Version: 2.3.4 - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f From 31f43836b8ca3c0a35c9dac148deaf47e316f4d2 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Fri, 4 Mar 2022 18:01:23 +0000 Subject: [PATCH 4/8] Add debug to lint --- .github/workflows/lint.yml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 78ab69af544b..a6f40c3a6839 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,6 +7,36 @@ on: branches-ignore: [staging, production] jobs: + # Debugging + isExpensifyEngineer: + runs-on: ubuntu-latest + + steps: + - name: Check whether the actor is member of engineering team + id: checkActor + uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872 + with: + GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} + username: ${{ github.actor }} + team: engineering + - name: Debug engineer + run: echo "The author is Expensify engineer - ${{ steps.checkActor.outputs.isTeamMember }}" + + # Debugging + isExpensifyEmployee: + runs-on: ubuntu-latest + + steps: + - name: Check whether the actor is member of expensify-expensify team + id: checkActor + uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872 + with: + GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} + username: ${{ github.actor }} + team: expensify-expensify + - name: Debug employee + run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.isTeamMember }}" + lint: if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest From ad9ee82ced00702f895286c9820b5d7ee02fad09 Mon Sep 17 00:00:00 2001 From: Vit Horacek <36083550+mountiny@users.noreply.github.com> Date: Mon, 7 Mar 2022 21:44:59 +0000 Subject: [PATCH 5/8] Update .github/workflows/lint.yml Co-authored-by: Andrew Gable --- .github/workflows/lint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a6f40c3a6839..43f498c89033 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,7 +33,7 @@ jobs: with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} username: ${{ github.actor }} - team: expensify-expensify + team: expensify - name: Debug employee run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.isTeamMember }}" From 7adcb7bc6e10b79f56b8784abb2dd1709e8b250c Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 8 Mar 2022 12:16:18 +0000 Subject: [PATCH 6/8] Check what teams are returned for me --- .github/workflows/lint.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a6f40c3a6839..a054dd72a4b9 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,9 +33,8 @@ jobs: with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} username: ${{ github.actor }} - team: expensify-expensify - name: Debug employee - run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.isTeamMember }}" + run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.teams }}" lint: if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_dispatch' }} From b3ceacf0442db49489c5f2f7afb86b722e8f9c22 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 8 Mar 2022 12:41:14 +0000 Subject: [PATCH 7/8] Debug the Expensify/expensify team --- .github/workflows/lint.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a054dd72a4b9..a8229a8275fb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -33,8 +33,9 @@ jobs: with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} username: ${{ github.actor }} + team: Expensify/expensify - name: Debug employee - run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.teams }}" + run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.isTeamMember }}" lint: if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_dispatch' }} From 0e0ebe50050635d4349d9b930635f4ba383701c0 Mon Sep 17 00:00:00 2001 From: Vit Horacek Date: Tue, 8 Mar 2022 13:07:46 +0000 Subject: [PATCH 8/8] Code clean up --- .github/workflows/lint.yml | 30 ------------------------------ .github/workflows/preDeploy.yml | 14 +++++++------- 2 files changed, 7 insertions(+), 37 deletions(-) diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index a8229a8275fb..78ab69af544b 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -7,36 +7,6 @@ on: branches-ignore: [staging, production] jobs: - # Debugging - isExpensifyEngineer: - runs-on: ubuntu-latest - - steps: - - name: Check whether the actor is member of engineering team - id: checkActor - uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872 - with: - GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - username: ${{ github.actor }} - team: engineering - - name: Debug engineer - run: echo "The author is Expensify engineer - ${{ steps.checkActor.outputs.isTeamMember }}" - - # Debugging - isExpensifyEmployee: - runs-on: ubuntu-latest - - steps: - - name: Check whether the actor is member of expensify-expensify team - id: checkActor - uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872 - with: - GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} - username: ${{ github.actor }} - team: Expensify/expensify - - name: Debug employee - run: echo "The author is Expensify employee - ${{ steps.checkActor.outputs.isTeamMember }}" - lint: if: ${{ github.actor != 'OSBotify' || github.event_name == 'workflow_dispatch' }} runs-on: ubuntu-latest diff --git a/.github/workflows/preDeploy.yml b/.github/workflows/preDeploy.yml index 29c20817a7be..b82fda5c6aaf 100644 --- a/.github/workflows/preDeploy.yml +++ b/.github/workflows/preDeploy.yml @@ -208,26 +208,26 @@ jobs: GITHUB_TOKEN: ${{ github.token }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - # Check if actor is member of Expensify organization by looking for engineering team - isExpensifyEngineer: + # Check if actor is member of Expensify organization by looking for Expensify/expensify team + isExpensifyEmployee: runs-on: ubuntu-latest outputs: - IS_EXPENSIFY_ENGINEER: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} + IS_EXPENSIFY_EMPLOYEE: ${{ fromJSON(steps.checkActor.outputs.isTeamMember) }} steps: - - name: Check whether the actor is member of engineering team + - name: Check whether the actor is member of Expensify/expensify team id: checkActor uses: tspascoal/get-user-teams-membership@baf2e6adf4c3b897bd65a7e3184305c165aec872 with: GITHUB_TOKEN: ${{ secrets.OS_BOTIFY_TOKEN }} username: ${{ github.actor }} - team: engineering + team: Expensify/expensify newContributorWelcomeMessage: runs-on: ubuntu-latest - needs: isExpensifyEngineer - if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEngineer.outputs.IS_EXPENSIFY_ENGINEER) }} + needs: isExpensifyEmployee + if: ${{ github.actor != 'OSBotify' && !fromJSON(needs.isExpensifyEmployee.outputs.IS_EXPENSIFY_EMPLOYEE) }} steps: # Version: 2.3.4 - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f