Skip to content

Commit a802c2b

Browse files
authored
simplify labeler script (#4114)
* fix codeowners ordering * simplify the community PR comment * remove community comment completely
1 parent 9a96172 commit a802c2b

File tree

1 file changed

+30
-25
lines changed

1 file changed

+30
-25
lines changed

.github/workflows/labeler.yml

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ jobs:
1515
runs-on: ubuntu-latest
1616
steps:
1717

18-
- name: Add agent-java label
19-
run: gh issue edit "${NUMBER}" --add-label "agent-java" --repo "${{ github.repository }}"
20-
env:
21-
NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
22-
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
23-
2418
- name: Get token
2519
id: get_token
2620
uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a # v2.1.0
@@ -31,44 +25,55 @@ jobs:
3125
{
3226
"members": "read",
3327
"organization_projects": "write",
34-
"issues": "read"
28+
"issues": "read",
29+
"pull_requests": "write"
3530
}
3631
37-
- name: Check team membership for user
38-
uses: elastic/[email protected]
39-
id: checkUserMember
32+
- name: Add agent-java label
33+
run: gh issue edit "${NUMBER}" --add-label "agent-java" --repo "${{ github.repository }}"
34+
env:
35+
NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
36+
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
37+
38+
- id: is_elastic_member
39+
uses: elastic/oblt-actions/github/is-member-of@v1
4040
with:
41-
username: ${{ github.actor }}
42-
team: 'apm'
43-
usernamesToExclude: |
44-
dependabot
45-
dependabot[bot]
46-
GITHUB_TOKEN: ${{ steps.get_token.outputs.token }}
41+
github-org: "elastic"
42+
github-user: ${{ github.actor }}
43+
github-token: ${{ steps.get_token.outputs.token }}
44+
45+
- id: user_type
46+
uses: elastic/oblt-actions/github/user-type@v1
47+
with:
48+
github-user: ${{ github.actor }}
49+
github-token: ${{ steps.get_token.outputs.token }}
4750

48-
- name: Show team membership
51+
- name: debug
4952
run: |
50-
echo "::debug::isTeamMember: ${{ steps.checkUserMember.outputs.isTeamMember }}"
51-
echo "::debug::isExcluded: ${{ steps.checkUserMember.outputs.isExcluded }}"
53+
echo "::notice:: is_elastic_member=${{ steps.is_elastic_member.outputs.result }}"
54+
echo "::notice:: user_type=${{ steps.user_type.outputs.result }}"
55+
echo "::notice:: github.actor=${{ github.actor }}"
56+
echo "::notice:: github.event_name=${{ github.event_name }}"
5257
5358
- name: Add community and triage labels
54-
if: steps.checkUserMember.outputs.isTeamMember != 'true' && steps.checkUserMember.outputs.isExcluded != 'true'
59+
if: steps.is_elastic_member.outputs.result == 'false' && steps.user_type.outputs.result == 'user'
5560
run: gh issue edit "${NUMBER}" --add-label "community,triage" --repo "${{ github.repository }}"
5661
env:
5762
NUMBER: ${{ github.event.issue.number || github.event.pull_request.number }}
5863
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5964

6065
- name: Assign new internal pull requests to project
6166
id: add-to-project
62-
if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request_target'
67+
if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target'
6368
uses: elastic/oblt-actions/github/project-add@v1
6469
with:
6570
github-token: ${{ steps.get_token.outputs.token }}
6671
project-id: 1829
67-
item-url: "${{ github.event.pull_request.html_url }}"
72+
item-url: ${{ github.event.pull_request.html_url }}
6873

6974
- name: set status in project
7075
id: set-project-status-field
71-
if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request_target'
76+
if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target'
7277
uses: elastic/oblt-actions/github/project-field-set@v1
7378
with:
7479
github-token: ${{ steps.get_token.outputs.token }}
@@ -79,7 +84,7 @@ jobs:
7984

8085
- name: set agent in project
8186
id: set-project-agent-field
82-
if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request_target'
87+
if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target'
8388
uses: elastic/oblt-actions/github/project-field-set@v1
8489
with:
8590
github-token: ${{ steps.get_token.outputs.token }}
@@ -90,7 +95,7 @@ jobs:
9095

9196
- name: set iteration in project
9297
id: set-project-iteration-field
93-
if: (steps.checkUserMember.outputs.isTeamMember == 'true' || steps.checkUserMember.outputs.isExcluded == 'true') && github.event_name == 'pull_request_target'
98+
if: steps.is_elastic_member.outputs.result == 'true' && github.event_name == 'pull_request_target'
9499
uses: elastic/oblt-actions/github/project-field-set@v1
95100
with:
96101
github-token: ${{ steps.get_token.outputs.token }}

0 commit comments

Comments
 (0)