diff --git a/.azurepipelines/MuDevOpsWrapper.yml b/.azurepipelines/MuDevOpsWrapper.yml index b289c9d..5318268 100644 --- a/.azurepipelines/MuDevOpsWrapper.yml +++ b/.azurepipelines/MuDevOpsWrapper.yml @@ -87,7 +87,7 @@ parameters: jobs: - template: Jobs/PrGate.yml@mu_devops parameters: - linux_container_image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:0e384ee + linux_container_image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:76935a3 ${{ if eq(parameters.rust_build, true) }}: linux_container_options: --security-opt seccomp=unconfined do_ci_build: ${{ parameters.do_ci_build }} @@ -111,7 +111,7 @@ jobs: container: - image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:0e384ee + image: ghcr.io/microsoft/mu_devops/ubuntu-24-build:76935a3 options: --user root --name mu_devops_build_container --security-opt seccomp=unconfined steps: diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml index ab56b24..5304c4b 100644 --- a/.azurepipelines/Ubuntu-GCC5.yml +++ b/.azurepipelines/Ubuntu-GCC5.yml @@ -13,7 +13,10 @@ variables: - group: architectures-arm64-x86-64 -- group: tool-chain-ubuntu-gcc +- name: tool_chain_tag + value: GCC +- name: vm_image + value: ubuntu-latest - group: coverage extends: diff --git a/.github/workflows/clangpdb-ci.yml b/.github/workflows/clangpdb-ci.yml index cfa97e2..94894d5 100644 --- a/.github/workflows/clangpdb-ci.yml +++ b/.github/workflows/clangpdb-ci.yml @@ -70,7 +70,7 @@ jobs: with: runner: ubuntu-latest setup-cmd: ci-setup - container: ghcr.io/microsoft/mu_devops/ubuntu-24-build:0e384ee + container: ghcr.io/microsoft/mu_devops/ubuntu-24-build:76935a3 python-version: "3.12" package-config: ${{ needs.package-matrix.outputs.matrix }} diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py index b7ffa94..4358de9 100644 --- a/.pytool/CISettings.py +++ b/.pytool/CISettings.py @@ -6,14 +6,15 @@ # SPDX-License-Identifier: BSD-2-Clause-Patent ## import glob -import os import logging +import os + +from edk2toolext import codeql as codeql_helpers from edk2toolext.environment import shell_environment from edk2toolext.invocables.edk2_ci_build import CiBuildSettingsManager -from edk2toolext.invocables.edk2_update import UpdateSettingsManager -from edk2toolext.invocables.edk2_pr_eval import PrEvalSettingsManager from edk2toolext.invocables.edk2_ci_setup import CiSetupSettingsManager -from edk2toolext import codeql as codeql_helpers +from edk2toolext.invocables.edk2_pr_eval import PrEvalSettingsManager +from edk2toolext.invocables.edk2_update import UpdateSettingsManager class Settings(CiBuildSettingsManager, UpdateSettingsManager, PrEvalSettingsManager, CiSetupSettingsManager): @@ -175,7 +176,7 @@ def GetDependencies(self): { "Path": "MU_BASECORE", "Url": "https://github.com/microsoft/mu_basecore.git", - "Branch": "release/202511", + "Branch": "release/202608", "Recurse": {"CIFile": ".pytool/CISettings.py"} } ]