Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[NoQA] Updating the isExpensifyEmployee action #8010

Merged
merged 9 commits into from
Mar 8, 2022
+5 −5
Merged

[NoQA] Updating the isExpensifyEmployee action #8010

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
15addfe
Rename the output
mountiny Mar 4, 2022
78c8b3d
Check for engineering team
mountiny Mar 4, 2022
8e80a48
Forgot to save the previous changes
mountiny Mar 4, 2022
31f4383
Add debug to lint
mountiny Mar 4, 2022
ad9ee82
Update .github/workflows/lint.yml
mountiny Mar 7, 2022
7adcb7b
Check what teams are returned for me
mountiny Mar 8, 2022
6ec5d69
Fetch upstream
mountiny Mar 8, 2022
b3ceacf
Debug the Expensify/expensify team
mountiny Mar 8, 2022
0e0ebe5
Code clean up
mountiny Mar 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/preDeploy.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 expensify-expensify team
# Check if actor is member of Expensify organization by looking for Expensify/expensify team
isExpensifyEmployee:
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
- 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
team: Expensify/expensify

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) }}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be an OR instead of an AND?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OR would let OSBotify through no? OSBotify is not a member of the team so if it will be OR the other condition will always be true.

steps:
# Version: 2.3.4
- uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f
Expand Down