Skip to content

Commit 3024ed1

Browse files
mu-automation[bot]ProjectMuBot
authored andcommitted
[CONFLICT] Repo File Sync: Update to Mu DevOps v15.0.3 (#1426)
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 [#16039182195](https://github.com/microsoft/mu_devops/actions/runs/16039182195) 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 80d8446 commit 3024ed1

File tree

8 files changed

+49
-1
lines changed

8 files changed

+49
-1
lines changed

.azurepipelines/MuDevOpsWrapper.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ resources:
1919
type: github
2020
endpoint: microsoft
2121
name: microsoft/mu_devops
22-
ref: refs/tags/v15.0.2
22+
ref: refs/tags/v15.0.3
2323

2424
parameters:
2525
- name: do_ci_build

.github/workflows/codeql.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ jobs:
4343
gather_packages:
4444
name: Gather Repo Packages
4545
runs-on: ubuntu-latest
46+
permissions:
47+
contents: read
4648
outputs:
4749
packages: ${{ steps.generate_matrix.outputs.packages }}
4850

@@ -165,6 +167,11 @@ jobs:
165167
- name: Get Cargo Tool Details
166168
id: get_cargo_tool_details
167169
shell: python
170+
<<<<<<< HEAD
171+
=======
172+
env:
173+
AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
174+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))
168175
run: |
169176
import os
170177
import requests
@@ -206,6 +213,18 @@ jobs:
206213
print(f'cargo_make_cache_key={cache_key}', file=fh)
207214
print(f'cargo_make_version={latest_cargo_make_version}', file=fh)
208215
216+
<<<<<<< HEAD
217+
=======
218+
219+
# Temporarily disable caching cargo-make as it stopped working in some repos recently
220+
# and need to be investigated
221+
# - name: Attempt to Load cargo-make From Cache
222+
# id: cargo_make_cache
223+
# uses: actions/cache@v4
224+
# with:
225+
# path: ${{ steps.get_cargo_tool_details.outputs.cargo_bin_path }}
226+
# key: ${{ steps.get_cargo_tool_details.outputs.cargo_make_cache_key }}
227+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))
209228

210229
- name: Attempt to Load cargo-make From Cache
211230
id: cargo_make_cache

.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+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))

.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+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))

.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+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))

.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+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))
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+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))

.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+
>>>>>>> 18a9fd3573 (Repo File Sync: Update to Mu DevOps v15.0.3 (#1426))

0 commit comments

Comments
 (0)