Skip to content

Commit 08fc101

Browse files
mu-automation[bot]ProjectMuBot
authored andcommitted
[CONFLICT] Repo File Sync: Update workflows and container to mu_devops v17 (#1492)
synced local file(s) with [microsoft/mu_devops](https://github.com/microsoft/mu_devops). 🤖: View the [Repo File Sync Configuration File](https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml) to see how files are synced. --- This PR was created automatically by the [repo-file-sync-action](https://github.com/BetaHuhn/repo-file-sync-action) workflow run [#17437071345](https://github.com/microsoft/mu_devops/actions/runs/17437071345) Signed-off-by: Project Mu UEFI Bot <[email protected]> Co-authored-by: mu-automation[bot] <204385837+mu-automation[bot]@users.noreply.github.com>
1 parent f9587cf commit 08fc101

File tree

7 files changed

+41
-0
lines changed

7 files changed

+41
-0
lines changed

.azurepipelines/MuDevOpsWrapper.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff 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/v17.0.0
26+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))
2327

2428
parameters:
2529
- name: do_ci_build
@@ -82,7 +86,11 @@ parameters:
8286
jobs:
8387
- template: Jobs/PrGate.yml@mu_devops
8488
parameters:
89+
<<<<<<< HEAD
8590
linux_container_image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:68fa63a
91+
=======
92+
linux_container_image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:737aacc
93+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))
8694
${{ if eq(parameters.rust_build, true) }}:
8795
linux_container_options: --security-opt seccomp=unconfined
8896
do_ci_build: ${{ parameters.do_ci_build }}
@@ -105,7 +113,11 @@ jobs:
105113

106114
container:
107115

116+
<<<<<<< HEAD
108117
image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:68fa63a
118+
=======
119+
image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:737aacc
120+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))
109121
options: --user root --name mu_devops_build_container --security-opt seccomp=unconfined
110122

111123
steps:

.github/workflows/issue-assignment.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,13 @@ on:
1919
jobs:
2020
apply:
2121

22+
<<<<<<< HEAD
2223
permissions:
2324
contents: read
2425
issues: write
2526

2627
uses: microsoft/mu_devops/.github/workflows/[email protected]
28+
=======
29+
uses: microsoft/mu_devops/.github/workflows/[email protected]
30+
secrets: inherit
31+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))

.github/workflows/label-issues.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,14 @@ on:
3131

3232
jobs:
3333
apply:
34+
<<<<<<< HEAD
3435

3536
permissions:
3637
contents: read
3738
pull-requests: write
3839

3940
uses: microsoft/mu_devops/.github/workflows/[email protected]
41+
=======
42+
uses: microsoft/mu_devops/.github/workflows/[email protected]
43+
secrets: inherit
44+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))

.github/workflows/label-sync.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ on:
2525
jobs:
2626
sync:
2727

28+
<<<<<<< HEAD
2829
permissions:
2930
issues: write
3031

3132
uses: microsoft/mu_devops/.github/workflows/[email protected]
33+
=======
34+
uses: microsoft/mu_devops/.github/workflows/[email protected]
35+
secrets: inherit
36+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))

.github/workflows/release-draft.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,13 @@ jobs:
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/[email protected]
40+
=======
41+
uses: microsoft/mu_devops/.github/workflows/[email protected]
42+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))
3943
secrets: inherit

.github/workflows/stale.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,13 @@ on:
2525
jobs:
2626
check:
2727

28+
<<<<<<< HEAD
2829
permissions:
2930
issues: write
3031
pull-requests: write
3132

3233
uses: microsoft/mu_devops/.github/workflows/[email protected]
34+
=======
35+
uses: microsoft/mu_devops/.github/workflows/[email protected]
36+
secrets: inherit
37+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))

.github/workflows/triage-issues.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ on:
2020
jobs:
2121
triage:
2222

23+
<<<<<<< HEAD
2324
permissions:
2425
issues: write
2526

2627
uses: microsoft/mu_devops/.github/workflows/[email protected]
28+
=======
29+
uses: microsoft/mu_devops/.github/workflows/[email protected]
30+
secrets: inherit
31+
>>>>>>> 373eb4936f (Repo File Sync: Update workflows and container to mu_devops v17 (#1492))

0 commit comments

Comments
 (0)