Skip to content

Commit 7132b98

Browse files
authored
Merge branch 'main' into personal/joeyvagedes/concurrency
2 parents af29dfa + c7453e8 commit 7132b98

File tree

4 files changed

+32
-6
lines changed

4 files changed

+32
-6
lines changed

.github/workflows/clangpdb-ci.yml

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,11 @@ on:
2525
branches:
2626
- main
2727

28+
concurrency:
29+
group: clangpdb-package-ci-${{ github.ref }}
30+
31+
cancel-in-progress: true
32+
2833
jobs:
2934
package-matrix:
3035
name: Gather Repository Packages
@@ -69,3 +74,24 @@ jobs:
6974
python-version: "3.12"
7075
package-config: ${{ needs.package-matrix.outputs.matrix }}
7176

77+
78+
final:
79+
name: Collapse Results
80+
if: ${{ always() }}
81+
82+
needs: [ubuntu-ci, windows-ci]
83+
runs-on: ubuntu-latest
84+
85+
steps:
86+
- name: Check Matrix Jobs Results
87+
run: |
88+
echo "Ubuntu CI result: ${{ needs.ubuntu-ci.result }}"
89+
echo "Windows CI result: ${{ needs.windows-ci.result }}"
90+
91+
if [[ "${{ needs.ubuntu-ci.result }}" == "failure" || "${{ needs.windows-ci.result }}" == "failure" ]]; then
92+
echo "One or more CI jobs failed"
93+
exit 1
94+
else
95+
echo "All ubuntu and windows CI matrix jobs completed successfully"
96+
fi
97+

.github/workflows/pull-request-formatting-validator.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
6969
- name: Check for Validation Errors
7070
if: env.VALIDATION_ERROR
71-
uses: actions/github-script@v8
71+
uses: actions/github-script@v9
7272
with:
7373
script: |
7474
core.setFailed('PR Formatting Validation Check Failed!')

pip-requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
# https://www.python.org/dev/peps/pep-0440/#version-specifiers
1313
##
1414

15-
edk2-pytool-library~=0.23.12
15+
edk2-pytool-library~=0.23.13
1616
edk2-pytool-extensions~=0.31.0
1717
xmlschema==4.3.1
18-
regex==2026.3.32
19-
pygount==3.1.1
18+
regex==2026.4.4
19+
pygount==3.2.0
2020
pywin32==311; sys_platform == 'win32'
2121
setuptools==82.0.1
22-
poetry==2.3.3
22+
poetry==2.3.4
2323
fdt==0.3.3

0 commit comments

Comments
 (0)