Skip to content

Commit ada2b71

Browse files
committed
Merge branch 'main' of https://github.com/microsoft/containers-toolkit into HEAD
2 parents 4dd975f + cb3edde commit ada2b71

25 files changed

+4042
-380
lines changed

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@ docs/ @tinamor
99

1010
# Tools
1111
containers-toolkit//Public/BuildkitTools.psm1 @profnandaa @billywr @danielGithinji
12-
containers-toolkit/Public/ontainerdTools.psm1 @charitykathure
12+
containers-toolkit/Public/ContainerdTools.psm1 @charitykathure
1313
containers-toolkit/Public/ContainerNetworkTools.psm1 @iankingori
1414
containers-toolkit/Public/NerdctlTools.psm1 @tinamor

.github/actions/sign-scripts/action.yaml

Lines changed: 0 additions & 64 deletions
This file was deleted.

.github/actions/sign-scripts/sign-scripts.ps1

Lines changed: 0 additions & 123 deletions
This file was deleted.

.github/pull_request_template.md

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,34 @@
1-
## PR description
21

3-
### Github issue/ discussion ()
2+
## PR Description
43

5-
_related Isuue/discussion(s)_
4+
_What does this PR achieve or fix?_
65

7-
### Background information
6+
- _Related isuue/discussion(s): Link to the issue or discussion that this PR addresses._
7+
- _Background information: From the reviewer's perspective, what context do they need to understand this PR?_
8+
_Additional information: What does this PR achieve/fix._
89

9-
_From the perspective of the reviewer, what context do they need to know to understand this PR?_
10+
### TODOs Not Included in This PR
1011

11-
### What does this PR do
12+
_What issues will/should be addressed in follow-up PRs? Link any existing related issues._
1213

13-
_What does this PR achieve/fix._
14-
15-
### TODOs not included in this PR
16-
17-
_What issues will/should be addressed in followup PRs. Link any of these issues if they exist_
18-
19-
### Testing information
14+
### Testing Information
2015

2116
_How to test the changes_
2217

23-
### Relevant links ()
18+
### Relevant Links
2419

25-
_Any links from your research that will help explain the changes_
20+
Any links from your research that help explain the changes
2621

2722
## Checklist
2823

29-
As part of our commitment to engineering excellence, **before** submitting this PR, please make sure:
24+
As part of our commitment to engineering excellence, **before** submitting this PR, please ensure:
3025

31-
- [ ] You've tested this code in both Desktop & Server environments and AMD & ARM64 enviroments (**functional testing**).
32-
- [ ] You've added **unit tests** for new code.
33-
- [ ] You've added/updated documentation in the [cmdlet docs](../docs/About/), [command-reference.md](../docs/command-reference.md) and the [modules help files](../containers-toolkit/en-US/containers-toolkit-help.xml).
34-
- [ ] You've reviewed the PR/code best practices defined in the [CONTRIBUTING.md](../CONTRIBUTING.md).
26+
- [ ] You have tested this code in both Desktop and Server environments, as well as AMD64 and ARM64 environments (**functional testing**).
27+
- [ ] You have added **unit tests** for new code.
28+
- [ ] You have added or updated documentation in the [cmdlet docs](../docs/About/), [command-reference.md](../docs/command-reference.md), and the [modules help files](../containers-toolkit/en-US/containers-toolkit-help.xml).
29+
- [ ] You have reviewed the PR/code best practices defined in the [CONTRIBUTING.md](../CONTRIBUTING.md).
3530

36-
In addition, **after** this PR has been reviewed, please agree to:
31+
In addition, **after** this PR has been reviewed, please ensure:
3732

38-
- [ ] If changes have been made to your PR in the process of addressing comments, please make sure to test again the _final_ version in both AMD and ARM64 environments.
39-
- [ ] Validate your changes have not introduced any regressions.
33+
- [ ] If you make changes while addressing review comments, you test the _final_ version again in both AMD64 and ARM64 environments.
34+
- [ ] You validate that your changes have not introduced any regressions.

.github/workflows/ci-build.yaml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ on:
2626
paths-ignore:
2727
- "docs/**"
2828
- "*.md"
29-
- en-US/**"
29+
- "en-US/**"
30+
- "package.json"
31+
- "package-lock.json"
3032

3133
env:
3234
MODULE_DIR: .\Containers-Toolkit
@@ -114,6 +116,15 @@ jobs:
114116
$ErrorActionPreference = 'Continue'
115117
${{ env.BUILD_SCRIPTS_DIR }}\run-tests.ps1
116118
119+
# Get failed tests
120+
Write-Host "Getting failed tests from ${{ env.PESTER_RESULTS_DIR }}\Test-Results.xml"
121+
$results = (Select-Xml -Path "${{ env.PESTER_RESULTS_DIR }}\Test-Results.xml" -XPath "//test-case").Node
122+
$failedTests = $results | Where-Object { ($_.success -eq $false) -and ($_.result -ne "Ignored") }
123+
if ($failedTests.Count -gt 0) {
124+
$failedTestsName = ($failedTests | ForEach-Object { $_.name }) -join "`n"
125+
Write-Host "Failed tests:`n$failedTestsName" -Foregroundcolor Red
126+
echo "$failedTestsName" >> $env:GITHUB_STEP_SUMMARY
127+
}
117128
- name: Publish Pester results
118129
uses: actions/upload-artifact@v4
119130
with:
@@ -133,6 +144,7 @@ jobs:
133144
test-coverage:
134145
needs: pester
135146
runs-on: ubuntu-latest
147+
continue-on-error: true
136148
steps:
137149
- name: Download coverage results artifact
138150
uses: actions/download-artifact@v4
@@ -159,12 +171,6 @@ jobs:
159171
name: coveragereport # Artifact name
160172
path: coveragereport # Directory containing files to upload
161173

162-
- name: Publish coverage summary
163-
uses: marocchino/sticky-pull-request-comment@v2
164-
continue-on-error: true
165-
with:
166-
path: coveragereport/SummaryGithub.md
167-
168174
- name: Post results
169175
run: |
170-
cat coveragereport/SummaryGithub.md >> $env:GITHUB_STEP_SUMMARY
176+
cat coveragereport/SummaryGithub.md >> $env:GITHUB_STEP_SUMMARY

0 commit comments

Comments
 (0)