-
Notifications
You must be signed in to change notification settings - Fork 206
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into feature/provenance
- Loading branch information
Showing
224 changed files
with
2,890 additions
and
1,557 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,90 @@ | ||
|
|
||
| name: Auto Assign to Project(s) | ||
|
|
||
| name: Add to APM Agents Project | ||
| on: | ||
| issues: | ||
| types: [opened, edited, milestoned] | ||
| pull_request_target: | ||
| types: [opened, edited, milestoned] | ||
| env: | ||
| MY_GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }} | ||
| types: [ opened, milestoned ] | ||
|
|
||
| permissions: | ||
| contents: read | ||
|
|
||
| jobs: | ||
| assign_one_project: | ||
| add_to_project: | ||
| if: github.event.issue && github.event.issue.milestone | ||
| runs-on: ubuntu-latest | ||
| name: Assign milestoned to Project | ||
| steps: | ||
| - name: Assign issues with milestones to project | ||
| uses: elastic/[email protected] | ||
| if: github.event.issue && github.event.issue.milestone | ||
| with: | ||
| project: 'https://github.com/orgs/elastic/projects/454' | ||
| project_id: '5882982' | ||
| column_name: 'Planned' | ||
| - name: Assign new pull requests to project | ||
| uses: elastic/[email protected] | ||
| if: github.event.action == 'opened' && github.event.pull_request | ||
| with: | ||
| project: 'https://github.com/orgs/elastic/projects/454' | ||
| project_id: '5882982' | ||
| column_name: 'In Progress' | ||
|
|
||
| - name: Get project data | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }} | ||
| TEAM: .NET | ||
| ORGANIZATION: elastic | ||
| PROJECT_NUMBER: 595 | ||
| run: | | ||
| gh api graphql -f query=' | ||
| query($org: String!, $number: Int!) { | ||
| organization(login: $org){ | ||
| projectV2(number: $number) { | ||
| id | ||
| fields(first:20) { | ||
| nodes { | ||
| ... on ProjectV2Field { | ||
| id | ||
| name | ||
| } | ||
| ... on ProjectV2SingleSelectField { | ||
| id | ||
| name | ||
| options { | ||
| id | ||
| name | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json | ||
| echo 'PROJECT_ID='$(jq '.data.organization.projectV2.id' project_data.json) >> $GITHUB_ENV | ||
| echo 'TEAM_FIELD_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Team") | .id' project_data.json) >> $GITHUB_ENV | ||
| echo 'FIELD_OPTION_ID='$(jq '.data.organization.projectV2.fields.nodes[] | select(.name== "Team") | .options[] | select(.name== "$TEAM") | .id' project_data.json) >> $GITHUB_ENV | ||
| - name: Add issue to project | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }} | ||
| ISSUE_ID: ${{ github.event.issue.node_id }} | ||
| run: | | ||
| item_id="$( gh api graphql -f query=' | ||
| mutation($project:ID!, $pr:ID!) { | ||
| addProjectV2ItemById(input: {projectId: $project, contentId: $pr}) { | ||
| item { | ||
| id | ||
| } | ||
| } | ||
| }' -f project=$PROJECT_ID -f pr=$ISSUE_ID --jq '.data.addProjectV2ItemById.item.id')" | ||
| echo 'ITEM_ID='$item_id >> $GITHUB_ENV | ||
| - name: Set fields | ||
| env: | ||
| GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }} | ||
| run: | | ||
| gh api graphql -f query=' | ||
| mutation ( | ||
| $project: ID! | ||
| $item: ID! | ||
| $team_field: ID! | ||
| $team_value: String! | ||
| ) { | ||
| set_agent: updateProjectV2ItemFieldValue(input: { | ||
| projectId: $project | ||
| itemId: $item | ||
| fieldId: $team_field | ||
| value: { | ||
| singleSelectOptionId: $team_value | ||
| } | ||
| }) { | ||
| projectV2Item { | ||
| id | ||
| } | ||
| } | ||
| }' -f project=$PROJECT_ID -f item=$ITEM_ID -f team_field=$TEAM_FIELD_ID -f team_value=${{ env.FIELD_OPTION_ID }} --silent |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,34 +5,37 @@ on: | |
| pull_request_target: | ||
| types: [opened] | ||
|
|
||
| # '*: write' permissions for https://docs.github.com/en/rest/issues/labels?apiVersion=2022-11-28#add-labels-to-an-issue | ||
| permissions: | ||
| contents: read | ||
| issues: write | ||
| pull-requests: write | ||
|
|
||
| jobs: | ||
| triage: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Add agent-dotnet label | ||
| uses: actions-ecosystem/action-add-labels@v1 | ||
| with: | ||
| labels: agent-dotnet | ||
| - name: Check team membership for user | ||
| uses: elastic/[email protected] | ||
| id: checkUserMember | ||
|
|
||
| - id: is_elastic_member | ||
| uses: elastic/apm-pipeline-library/.github/actions/is-member-elastic-org@current | ||
| with: | ||
| username: ${{ github.actor }} | ||
| team: 'apm' | ||
| usernamesToExclude: | | ||
| apmmachine | ||
| dependabot | ||
| dependabot[bot] | ||
| GITHUB_TOKEN: ${{ secrets.APM_TECH_USER_TOKEN }} | ||
| - name: Add community and triage lables | ||
| if: steps.checkUserMember.outputs.isTeamMember != 'true' && steps.checkUserMember.outputs.isExcluded != 'true' | ||
| uses: actions-ecosystem/action-add-labels@v1 | ||
| token: ${{ secrets.APM_TECH_USER_TOKEN }} | ||
|
|
||
| - name: Add community and triage labels | ||
| if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' | ||
| uses: actions/github-script@v7 | ||
| with: | ||
| labels: | | ||
| community | ||
| triage | ||
| script: | | ||
| github.rest.issues.addLabels({ | ||
| issue_number: context.issue.number, | ||
| owner: context.repo.owner, | ||
| repo: context.repo.repo, | ||
| labels: ["community", "triage"] | ||
| }) | ||
| - name: Add comment for community PR | ||
| if: steps.checkUserMember.outputs.isTeamMember != 'true' && steps.checkUserMember.outputs.isExcluded != 'true' | ||
| if: contains(steps.is_elastic_member.outputs.result, 'false') && github.actor != 'dependabot[bot]' | ||
| uses: wow-actions/auto-comment@v1 | ||
| with: | ||
| GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
|
@@ -41,5 +44,4 @@ jobs: | |
| It may take some time before we review a PR, so even if you don’t see activity for some time, it **does not** mean that we have forgotten about it. | ||
| Every once in a while we go through a process of prioritization, after which we are focussing on the tasks that were planned for the upcoming [milestone](https://github.com/elastic/apm-agent-dotnet/milestones). The prioritization status is typically reflected through the PR labels. It could be pending triage, a candidate for a future milestone, or have a target milestone set to it. | ||
| Every once in a while we go through a process of prioritization, after which we are focussing on the tasks that were planned for the upcoming [milestone](https://github.com/elastic/apm-agent-dotnet/milestones). The prioritization status is typically reflected through the PR labels. It could be pending triage, a candidate for a future milestone, or have a target milestone set to it. | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -31,12 +31,6 @@ jobs: | |
| test-iis: | ||
| runs-on: windows-latest | ||
|
|
||
| # disable IIS on CI for now. | ||
| # Run locally and started failing randomly on github actions | ||
| # Could be because of plethora of reasons including no disk space | ||
| # Requires longer investigation | ||
| if: ${{ false }} | ||
|
|
||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| - name: Bootstrap Action Workspace | ||
|
|
@@ -46,9 +40,19 @@ jobs: | |
| with: | ||
| path: ~/.nuget/packages | ||
| key: ${{ runner.os }}-nuget-${{ hashFiles('**/*.[cf]sproj*') }} | ||
|
|
||
| - name: Add msbuild to PATH | ||
| uses: microsoft/[email protected] | ||
| uses: microsoft/setup-msbuild@v2 | ||
|
|
||
|
|
||
| - name: Clean the application | ||
| shell: cmd | ||
| run: msbuild /t:Clean /p:Configuration=Release | ||
|
|
||
| - name: Restore the application | ||
| shell: cmd | ||
| run: msbuild /t:Restore /p:Configuration=Release | ||
|
|
||
| - name: Build the application | ||
| shell: cmd | ||
| run: | | ||
|
|
@@ -74,9 +78,13 @@ jobs: | |
| shell: cmd | ||
| run: | | ||
| REM enable permissions for the Application Pool Identity group | ||
| icacls C:\Windows\Temp /grant "IIS_IUSRS:(OI)(CI)F" /T | ||
| icacls "c:\Windows\Microsoft.NET\Framework64\v4.0.30319\Temporary ASP.NET Files" /grant "IIS_IUSRS:(OI)(CI)F" /T | ||
| icacls %cd% /t /q /grant "IIS_IUSRS:(OI)(CI)(IO)(RX)" | ||
| REM enable permissions for the anonymous access group | ||
| icacls %cd% /t /q /grant "IUSR:(OI)(CI)(IO)(RX)" | ||
| icacls C:\Windows\Temp /grant "IUSR:(OI)(CI)F" /T | ||
| icacls "c:\Windows\Microsoft.NET\Framework64\v4.0.30319\Temporary ASP.NET Files" /grant "IUSR:(OI)(CI)F" /T | ||
| - name: Run tests | ||
| shell: cmd | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.