From b54add6a4513e36f904b34469b353235b6407726 Mon Sep 17 00:00:00 2001 From: Joey Vagedes Date: Mon, 20 Nov 2023 14:35:41 -0800 Subject: [PATCH 1/2] Integration Steps for mu_devops@9.0.1 --- .azurepipelines/Ubuntu-GCC5.yml | 1 + .azurepipelines/Windows-VS.yml | 1 + .github/codecov.yml | 10 ++++++++++ pip-requirements.txt | 3 ++- 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 .github/codecov.yml diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml index 2fe023a8..c0ff687c 100644 --- a/.azurepipelines/Ubuntu-GCC5.yml +++ b/.azurepipelines/Ubuntu-GCC5.yml @@ -14,6 +14,7 @@ variables: - group: architectures-arm-64-x86-64 - group: tool-chain-ubuntu-gcc +- group: coverage extends: template: MuDevOpsWrapper.yml diff --git a/.azurepipelines/Windows-VS.yml b/.azurepipelines/Windows-VS.yml index 56a01b1a..7acb0406 100644 --- a/.azurepipelines/Windows-VS.yml +++ b/.azurepipelines/Windows-VS.yml @@ -14,6 +14,7 @@ variables: - group: architectures-x86-64 - group: tool-chain-windows-visual-studio-latest +- group: coverage extends: template: MuDevOpsWrapper.yml diff --git a/.github/codecov.yml b/.github/codecov.yml new file mode 100644 index 00000000..8f5172a2 --- /dev/null +++ b/.github/codecov.yml @@ -0,0 +1,10 @@ +## @file +# codecov upload configuration file to carryforward coverage results of +# packages that do not upload coverage results for a given pull request. +## +# Copyright (c) Microsoft Corporation. +# SPDX-License-Identifier: BSD-2-Clause-Patent +## +flags: + SetupDataPkg: + carryforward: true diff --git a/pip-requirements.txt b/pip-requirements.txt index 47d734df..904e489f 100644 --- a/pip-requirements.txt +++ b/pip-requirements.txt @@ -18,4 +18,5 @@ edk2-basetools==0.1.49 antlr4-python3-runtime==4.13.1 xmlschema==2.5.0 regex==2023.10.3 -pywin32==306; sys_platform == 'win32' \ No newline at end of file +pywin32==306; sys_platform == 'win32' +pygount==1.6.1 From b2d1e0496346c183ca6aa517514f876e52f8d067 Mon Sep 17 00:00:00 2001 From: uefibot Date: Mon, 20 Nov 2023 22:02:18 +0000 Subject: [PATCH 2/2] Repo File Sync: synced file(s) with microsoft/mu_devops Signed-off-by: Project Mu UEFI Bot --- .azurepipelines/MuDevOpsWrapper.yml | 13 +++---------- .github/workflows/auto-approve.yml | 2 +- .github/workflows/auto-merge.yml | 2 +- .github/workflows/issue-assignment.yml | 2 +- .github/workflows/label-issues.yml | 2 +- .github/workflows/label-sync.yml | 2 +- .../workflows/pull-request-formatting-validator.yml | 2 +- .github/workflows/release-draft.yml | 2 +- .github/workflows/stale.yml | 2 +- .github/workflows/triage-issues.yml | 2 +- 10 files changed, 12 insertions(+), 19 deletions(-) diff --git a/.azurepipelines/MuDevOpsWrapper.yml b/.azurepipelines/MuDevOpsWrapper.yml index 70a75dcb..a0e62896 100644 --- a/.azurepipelines/MuDevOpsWrapper.yml +++ b/.azurepipelines/MuDevOpsWrapper.yml @@ -1,6 +1,8 @@ ## @file # Azure Pipeline build file for a build using mu_devops. # +# To upload coverage results, set `coverage_upload_target` to `ado` or `codecov`. +# # NOTE: This file is automatically synchronized from Mu DevOps. Update the original file there # instead of the file in this repo. # @@ -17,7 +19,7 @@ resources: type: github endpoint: microsoft name: microsoft/mu_devops - ref: refs/tags/v7.2.0 + ref: refs/tags/v9.0.1 parameters: - name: do_ci_build @@ -40,13 +42,6 @@ parameters: displayName: Perform Stuart PR Evaluation type: boolean default: true -- name: calculate_code_coverage - displayName: Calculate Code Coverage From Unit Tests - default: false -- name: coverage_publish_target - displayName: Code Coverage Publish Target - type: string - default: 'ado' # 'ado', 'codecov' - name: container_build displayName: Flag for whether this repo should do stuart_setup type: boolean @@ -93,8 +88,6 @@ jobs: do_ci_build: ${{ parameters.do_ci_build }} do_ci_setup: ${{ parameters.do_ci_setup }} do_pr_eval: ${{ parameters.do_pr_eval }} - calculate_code_coverage: ${{ parameters.calculate_code_coverage }} - coverage_publish_target: ${{ parameters.coverage_publish_target }} do_non_ci_setup: ${{ parameters.do_non_ci_setup }} do_non_ci_build: ${{ parameters.do_non_ci_build }} build_matrix: ${{ parameters.build_matrix }} diff --git a/.github/workflows/auto-approve.yml b/.github/workflows/auto-approve.yml index f1360458..ddb10442 100644 --- a/.github/workflows/auto-approve.yml +++ b/.github/workflows/auto-approve.yml @@ -25,5 +25,5 @@ jobs: approval_check: if: | github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot' - uses: microsoft/mu_devops/.github/workflows/AutoApprover.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/AutoApprover.yml@v9.0.1 secrets: inherit diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml index dd835308..fd3fc00b 100644 --- a/.github/workflows/auto-merge.yml +++ b/.github/workflows/auto-merge.yml @@ -26,5 +26,5 @@ jobs: merge_check: if: | github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'uefibot' - uses: microsoft/mu_devops/.github/workflows/AutoMerger.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/AutoMerger.yml@v9.0.1 secrets: inherit diff --git a/.github/workflows/issue-assignment.yml b/.github/workflows/issue-assignment.yml index 65d93fed..5a0cf888 100644 --- a/.github/workflows/issue-assignment.yml +++ b/.github/workflows/issue-assignment.yml @@ -18,4 +18,4 @@ on: jobs: apply: - uses: microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v9.0.1 diff --git a/.github/workflows/label-issues.yml b/.github/workflows/label-issues.yml index 739549e9..3319ac23 100644 --- a/.github/workflows/label-issues.yml +++ b/.github/workflows/label-issues.yml @@ -31,4 +31,4 @@ on: jobs: apply: - uses: microsoft/mu_devops/.github/workflows/Labeler.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/Labeler.yml@v9.0.1 diff --git a/.github/workflows/label-sync.yml b/.github/workflows/label-sync.yml index 9289e064..7cf4ee76 100644 --- a/.github/workflows/label-sync.yml +++ b/.github/workflows/label-sync.yml @@ -24,4 +24,4 @@ on: jobs: sync: - uses: microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v9.0.1 diff --git a/.github/workflows/pull-request-formatting-validator.yml b/.github/workflows/pull-request-formatting-validator.yml index 13ad68a9..34e27d46 100644 --- a/.github/workflows/pull-request-formatting-validator.yml +++ b/.github/workflows/pull-request-formatting-validator.yml @@ -48,7 +48,7 @@ jobs: - name: Check for Validation Errors if: env.VALIDATION_ERROR - uses: actions/github-script@v7 + uses: actions/github-script@v6 with: script: | core.setFailed('PR Formatting Validation Check Failed!') diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index 44283fc2..023ef404 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -27,5 +27,5 @@ on: jobs: draft: - uses: microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@v9.0.1 secrets: inherit diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml index 79087d5f..29095b3c 100644 --- a/.github/workflows/stale.yml +++ b/.github/workflows/stale.yml @@ -24,4 +24,4 @@ on: jobs: check: - uses: microsoft/mu_devops/.github/workflows/Stale.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/Stale.yml@v9.0.1 diff --git a/.github/workflows/triage-issues.yml b/.github/workflows/triage-issues.yml index 276e64b3..89451cb7 100644 --- a/.github/workflows/triage-issues.yml +++ b/.github/workflows/triage-issues.yml @@ -19,4 +19,4 @@ on: jobs: triage: - uses: microsoft/mu_devops/.github/workflows/IssueTriager.yml@v7.2.0 + uses: microsoft/mu_devops/.github/workflows/IssueTriager.yml@v9.0.1