From cf01be388312310534511244972257a112462a1b Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Fri, 6 Oct 2023 18:01:05 -0400 Subject: [PATCH 1/3] Fix Python minor version Set to Python 3.11 for now but do not allow newer minor versions to be picked up unless explicitly specified. Signed-off-by: Michael Kubacki --- .sync/workflows/leaf/codeql-platform.yml | 4 ++-- .sync/workflows/leaf/codeql.yml | 4 ++-- Steps/SetupPythonPreReqs.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.sync/workflows/leaf/codeql-platform.yml b/.sync/workflows/leaf/codeql-platform.yml index b26a75ef..3d45fb9e 100644 --- a/.sync/workflows/leaf/codeql-platform.yml +++ b/.sync/workflows/leaf/codeql-platform.yml @@ -46,7 +46,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '>=3.11' + python-version: '3.11' cache: 'pip' cache-dependency-path: 'pip-requirements.txt' @@ -129,7 +129,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '>=3.11' + python-version: '3.11' cache: 'pip' cache-dependency-path: 'pip-requirements.txt' diff --git a/.sync/workflows/leaf/codeql.yml b/.sync/workflows/leaf/codeql.yml index 466bda22..fda53f9e 100644 --- a/.sync/workflows/leaf/codeql.yml +++ b/.sync/workflows/leaf/codeql.yml @@ -48,7 +48,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '>=3.11' + python-version: '3.11' - name: Generate Package Matrix id: generate_matrix @@ -94,7 +94,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '>=3.11' + python-version: '3.11' cache: 'pip' cache-dependency-path: 'pip-requirements.txt' diff --git a/Steps/SetupPythonPreReqs.yml b/Steps/SetupPythonPreReqs.yml index 61513c54..1b344dd7 100644 --- a/Steps/SetupPythonPreReqs.yml +++ b/Steps/SetupPythonPreReqs.yml @@ -24,7 +24,7 @@ steps: - ${{ if eq(parameters.install_python, true) }}: - task: UsePythonVersion@0 inputs: - versionSpec: ">=3.10.6" + versionSpec: "3.11" architecture: x64 - ${{ if eq(parameters.install_pip_modules, true) }}: From fa125458ae0ab75ce15a0b7f2520644b7a664eb8 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Fri, 6 Oct 2023 18:12:30 -0400 Subject: [PATCH 2/3] Update to Python 3.12 Repos had already started picking up 3.12 because the minor version was previously not fixed. This change update the Python version to 3.12 to accelerate adoption and ensure compatibility. Signed-off-by: Michael Kubacki --- .github/actions/submodule-release-updater/action.yml | 2 +- .sync/workflows/leaf/codeql-platform.yml | 4 ++-- .sync/workflows/leaf/codeql.yml | 4 ++-- Steps/SetupPythonPreReqs.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/actions/submodule-release-updater/action.yml b/.github/actions/submodule-release-updater/action.yml index 90df5ee7..e22a4d96 100644 --- a/.github/actions/submodule-release-updater/action.yml +++ b/.github/actions/submodule-release-updater/action.yml @@ -34,7 +34,7 @@ runs: - name: Set up Python Environment uses: actions/setup-python@v4 with: - python-version: 3.11 + python-version: 3.12 - name: Install PIP Modules shell: bash diff --git a/.sync/workflows/leaf/codeql-platform.yml b/.sync/workflows/leaf/codeql-platform.yml index 3d45fb9e..8bde5ac2 100644 --- a/.sync/workflows/leaf/codeql-platform.yml +++ b/.sync/workflows/leaf/codeql-platform.yml @@ -46,7 +46,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'pip-requirements.txt' @@ -129,7 +129,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'pip-requirements.txt' diff --git a/.sync/workflows/leaf/codeql.yml b/.sync/workflows/leaf/codeql.yml index fda53f9e..cb059e8d 100644 --- a/.sync/workflows/leaf/codeql.yml +++ b/.sync/workflows/leaf/codeql.yml @@ -48,7 +48,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' - name: Generate Package Matrix id: generate_matrix @@ -94,7 +94,7 @@ jobs: - name: Install Python uses: actions/setup-python@v4 with: - python-version: '3.11' + python-version: '3.12' cache: 'pip' cache-dependency-path: 'pip-requirements.txt' diff --git a/Steps/SetupPythonPreReqs.yml b/Steps/SetupPythonPreReqs.yml index 1b344dd7..6487b471 100644 --- a/Steps/SetupPythonPreReqs.yml +++ b/Steps/SetupPythonPreReqs.yml @@ -24,7 +24,7 @@ steps: - ${{ if eq(parameters.install_python, true) }}: - task: UsePythonVersion@0 inputs: - versionSpec: "3.11" + versionSpec: "3.12" architecture: x64 - ${{ if eq(parameters.install_pip_modules, true) }}: From c0070beda7c11b458b5017669c8a27c11f6d2068 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Fri, 6 Oct 2023 18:14:54 -0400 Subject: [PATCH 3/3] .sync/Version.njk: Update Mu repos to Mu DevOps v7.0.0 Changes since last release: https://github.com/microsoft/mu_devops/compare/v6.5.1...v7.0.0 General release info: https://github.com/microsoft/mu_devops/releases Signed-off-by: Michael Kubacki --- .sync/Version.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.sync/Version.njk b/.sync/Version.njk index 372ac107..8080c842 100644 --- a/.sync/Version.njk +++ b/.sync/Version.njk @@ -30,7 +30,7 @@ #} {# The git ref value that files dependent on this repo will use. #} -{% set mu_devops = "v6.5.1" %} +{% set mu_devops = "v7.0.0" %} {# The latest Project Mu release branch value. #} {% set latest_mu_release_branch = "release/202302" %}