File tree Expand file tree Collapse file tree 7 files changed +35
-2
lines changed
Expand file tree Collapse file tree 7 files changed +35
-2
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,11 @@ resources:
1919 type : github
2020 endpoint : microsoft
2121 name : microsoft/mu_devops
22+ <<<<<<< HEAD
2223 ref : refs/tags/v15.0.2
24+ =======
25+ ref : refs/tags/v16.0.0
26+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
2327
2428parameters :
2529- name : do_ci_build
@@ -82,7 +86,7 @@ parameters:
8286jobs :
8387- template : Jobs/PrGate.yml@mu_devops
8488 parameters :
85- linux_container_image : ghcr.io/microsoft/mu_devops/ubuntu-24-build:68fa63a
89+ linux_container_image : ghcr.io/microsoft/mu_devops/ubuntu-24-build:71390ed
8690 ${{ if eq(parameters.rust_build, true) }} :
8791 linux_container_options : --security-opt seccomp=unconfined
8892 do_ci_build : ${{ parameters.do_ci_build }}
@@ -105,7 +109,7 @@ jobs:
105109
106110 container :
107111
108- image : ghcr.io/microsoft/mu_devops/ubuntu-24-build:68fa63a
112+ image : ghcr.io/microsoft/mu_devops/ubuntu-24-build:71390ed
109113 options : --user root --name mu_devops_build_container --security-opt seccomp=unconfined
110114
111115 steps :
Original file line number Diff line number Diff line change 1919jobs :
2020 apply :
2121
22+ <<<<<<< HEAD
2223 permissions :
2324 contents : read
2425 issues : write
2526
2627 uses : microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v15.0.2
28+ =======
29+ uses : microsoft/mu_devops/.github/workflows/IssueAssignment.yml@v16.0.0
30+ secrets : inherit
31+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
Original file line number Diff line number Diff line change 3131
3232jobs :
3333 apply :
34+ <<<<<<< HEAD
3435
3536 permissions :
3637 contents : read
3738 pull-requests : write
3839
3940 uses : microsoft/mu_devops/.github/workflows/Labeler.yml@v15.0.2
41+ =======
42+ uses : microsoft/mu_devops/.github/workflows/Labeler.yml@v16.0.0
43+ secrets : inherit
44+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
Original file line number Diff line number Diff line change 2525jobs :
2626 sync :
2727
28+ <<<<<<< HEAD
2829 permissions :
2930 issues : write
3031
3132 uses : microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v15.0.2
33+ =======
34+ uses : microsoft/mu_devops/.github/workflows/LabelSyncer.yml@v16.0.0
35+ secrets : inherit
36+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
Original file line number Diff line number Diff line change 3131 draft :
3232 name : Draft Releases
3333
34+ <<<<<<< HEAD
3435 permissions :
3536 contents : write
3637 pull-requests : write
3738
3839 uses : microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@v15.0.2
40+ =======
41+ uses : microsoft/mu_devops/.github/workflows/ReleaseDrafter.yml@v16.0.0
42+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
3943 secrets : inherit
Original file line number Diff line number Diff line change 2525jobs :
2626 check :
2727
28+ <<<<<<< HEAD
2829 permissions :
2930 issues : write
3031 pull-requests : write
3132
3233 uses : microsoft/mu_devops/.github/workflows/Stale.yml@v15.0.2
34+ =======
35+ uses : microsoft/mu_devops/.github/workflows/Stale.yml@v16.0.0
36+ secrets : inherit
37+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
Original file line number Diff line number Diff line change 2020jobs :
2121 triage :
2222
23+ <<<<<<< HEAD
2324 permissions :
2425 issues : write
2526
2627 uses : microsoft/mu_devops/.github/workflows/IssueTriager.yml@v15.0.2
28+ =======
29+ uses : microsoft/mu_devops/.github/workflows/IssueTriager.yml@v16.0.0
30+ secrets : inherit
31+ >>>>>>> 2d7c5b8bc9 (Repo File Sync: Update to Mu DevOps v16.0.0 (#1485))
You can’t perform that action at this time.
0 commit comments