From 5695926d2381b4bce605e60400bf6265cadc6376 Mon Sep 17 00:00:00 2001 From: uefibot Date: Wed, 23 Oct 2024 23:27:18 +0000 Subject: [PATCH] Repo File Sync: synced file(s) with makubacki/mu_devops Signed-off-by: Project Mu UEFI Bot --- .../actions/submodule-release-updater/action.yml | 11 +++++++++++ Containers/Ubuntu-22/Dockerfile | 10 ++++++++-- Steps/SetupPythonPreReqs.yml | 13 ++++++++++++- 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/.github/actions/submodule-release-updater/action.yml b/.github/actions/submodule-release-updater/action.yml index 8641094d..0cabd4db 100644 --- a/.github/actions/submodule-release-updater/action.yml +++ b/.github/actions/submodule-release-updater/action.yml @@ -1,9 +1,19 @@ # A GitHub action to create pull requests for new releases of submodules in a repository. # +# NOTE: This file is automatically synchronized from Mu DevOps. Update the original file there +# instead of the file in this repo. +# +# - Mu DevOps Repo: https://github.com/microsoft/mu_devops +# - File Sync Settings: https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml +# # Copyright (c) Microsoft Corporation. # SPDX-License-Identifier: BSD-2-Clause-Patent # +# NOTE: Because this pipeline YAML file is a Nunjucks template, the pipeline syntax of `{{}}` will conflict with +# Nunjucks style. Surround pipeline YAML code that uses `{{}}` within `raw` and `endraw` tags +# to allow it to pass through Nunjucks processing. + name: 'Submodule Release Updater' description: 'Checks if new releases are available for submodules and creates pull requests to update them.' @@ -423,3 +433,4 @@ runs: with open(os.environ['GITHUB_OUTPUT'], 'a') as fh: print(f'submodule-update-count={submodule_update_count}', file=fh) + diff --git a/Containers/Ubuntu-22/Dockerfile b/Containers/Ubuntu-22/Dockerfile index 5a0de86d..2206a919 100644 --- a/Containers/Ubuntu-22/Dockerfile +++ b/Containers/Ubuntu-22/Dockerfile @@ -11,6 +11,10 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent # +# NOTE: Because this pipeline YAML file is a Nunjucks template, the pipeline syntax of `{{}}` will conflict with +# Nunjucks style. Surround pipeline YAML code that uses `{{}}` within `raw` and `endraw` tags +# to allow it to pass through Nunjucks processing. + # # The build container layer is intended for pipeline use and is the minimal set # of tools required for building Project MU. @@ -129,10 +133,11 @@ RUN mkdir cargo_downloads && \ # Alternatives # + RUN update-alternatives \ - --install /usr/bin/python python /usr/bin/python3.10 1 && \ + --install /usr/bin/python python /usr/bin/python3.12 1 && \ update-alternatives \ - --install /usr/bin/python3 python3 /usr/bin/python3.10 1 && \ + --install /usr/bin/python3 python3 /usr/bin/python3.12 1 && \ update-alternatives \ --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_MAJOR_VERSION} 100 \ --slave /usr/bin/g++ g++ /usr/bin/g++-${GCC_MAJOR_VERSION} \ @@ -213,3 +218,4 @@ RUN apt-get update && \ less \ && \ apt-get clean + diff --git a/Steps/SetupPythonPreReqs.yml b/Steps/SetupPythonPreReqs.yml index 6487b471..84e7b2ad 100644 --- a/Steps/SetupPythonPreReqs.yml +++ b/Steps/SetupPythonPreReqs.yml @@ -1,10 +1,21 @@ ## @file # Azure Pipelines step to setup Python pre-requisites. # +# NOTE: This file is automatically synchronized from Mu DevOps. Update the original file there +# instead of the file in this repo. +# +# - Mu DevOps Repo: https://github.com/microsoft/mu_devops +# - File Sync Settings: https://github.com/microsoft/mu_devops/blob/main/.sync/Files.yml +# # Copyright (c) Microsoft Corporation. All rights reserved. # SPDX-License-Identifier: BSD-2-Clause-Patent ## +# NOTE: Because this pipeline YAML file is a Nunjucks template, the pipeline syntax of `{{}}` will conflict with +# Nunjucks style. Surround pipeline YAML code that uses `{{}}` within `raw` and `endraw` tags +# to allow it to pass through Nunjucks processing. + + parameters: - name: install_pip_modules displayName: Install PIP Modules @@ -24,7 +35,7 @@ steps: - ${{ if eq(parameters.install_python, true) }}: - task: UsePythonVersion@0 inputs: - versionSpec: "3.12" + versionSpec: 3.12 architecture: x64 - ${{ if eq(parameters.install_pip_modules, true) }}: