[PATCH v9 01/12] CI: make Python version configurable

public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed

* [PATCH v9 01/12] CI: make Python version configurable
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-11-30 23:46   ` [edk2-devel] " Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 02/12] OvmfPkg: CI: use Python version from defaults template Oliver Steffen
                   ` (10 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Add a new parameter "usePythonVersion" to the CI job templates.
This makes it possible to specify the version of Python to use.
The default value is '', in which case Python will not be downloaded
at runtime and the one provided by the VM/container image will be used.

Additionally, add a template .azurepipelines/templates/defaults.yml,
from which the default Pyhton version string can be obtained.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .azurepipelines/Windows-VS2019.yml                     | 4 ++++
 .azurepipelines/templates/defaults.yml                 | 3 +++
 .azurepipelines/templates/platform-build-run-steps.yml | 6 +++++-
 .azurepipelines/templates/pr-gate-build-job.yml        | 2 ++
 .azurepipelines/templates/pr-gate-steps.yml            | 6 ++++--
 5 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 .azurepipelines/templates/defaults.yml

diff --git a/.azurepipelines/Windows-VS2019.yml
b/.azurepipelines/Windows-VS2019.yml
index e4bd4b1d2283..89bccde82575 100644
--- a/.azurepipelines/Windows-VS2019.yml
+++ b/.azurepipelines/Windows-VS2019.yml
@@ -12,9 +12,13 @@ pr:
 - master
 - stable/*

+variables:
+  - template: templates/defaults.yml
+
 jobs:
 - template: templates/pr-gate-build-job.yml
   parameters:
     tool_chain_tag: 'VS2019'
     vm_image: 'windows-2019'
     arch_list: "IA32,X64"
+    usePythonVersion: ${{ variables.default_python_version }}
diff --git a/.azurepipelines/templates/defaults.yml
b/.azurepipelines/templates/defaults.yml
new file mode 100644
index 000000000000..314d03e33af8
--- /dev/null
+++ b/.azurepipelines/templates/defaults.yml
@@ -0,0 +1,3 @@
+
+variables:
+  default_python_version: ">=3.10.6"
diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
b/.azurepipelines/templates/platform-build-run-steps.yml
index 40a31a509fc5..8803d80cf51c 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -34,6 +34,9 @@ parameters:
 - name: extra_install_step
   type: stepList
   default: []
+- name: usePythonVersion
+  type: string
+  default: ''

 steps:
 - checkout: self
@@ -42,8 +45,9 @@ steps:

 - task: UsePythonVersion@0
   inputs:
-    versionSpec: ">=3.10.6"
+    versionSpec: ${{ parameters.usePythonVersion }}
     architecture: "x64"
+  condition: ne('${{ parameters.usePythonVersion }}', '')

 - script: pip install -r pip-requirements.txt --upgrade
   displayName: 'Install/Upgrade pip modules'
diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
b/.azurepipelines/templates/pr-gate-build-job.yml
index 7f88b41dc8d3..f0ef1142da49 100644
--- a/.azurepipelines/templates/pr-gate-build-job.yml
+++ b/.azurepipelines/templates/pr-gate-build-job.yml
@@ -12,6 +12,7 @@ parameters:
   tool_chain_tag: ''
   vm_image: ''
   arch_list: ''
+  usePythonVersion: ''

 # Build step
 jobs:
@@ -77,3 +78,4 @@ jobs:
       build_pkgs: $(Build.Pkgs)
       build_targets: $(Build.Targets)
       build_archs: ${{ parameters.arch_list }}
+      usePythonVersion: ${{ parameters.usePythonVersion }}
diff --git a/.azurepipelines/templates/pr-gate-steps.yml
b/.azurepipelines/templates/pr-gate-steps.yml
index cb431e53fcd1..27a44c06011c 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -12,6 +12,7 @@ parameters:
   build_pkgs: ''
   build_targets: ''
   build_archs: ''
+  usePythonVersion: ''

 steps:
 - checkout: self
@@ -20,8 +21,9 @@ steps:

 - task: UsePythonVersion@0
   inputs:
-    versionSpec: '>=3.10.6'
-    architecture: 'x64'
+    versionSpec: ${{ parameters.usePythonVersion }}
+    architecture: "x64"
+  condition: ne('${{ parameters.usePythonVersion }}', '')

 - script: pip install -r pip-requirements.txt --upgrade
   displayName: 'Install/Upgrade pip modules'
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [edk2-devel] [PATCH v9 01/12] CI: make Python version configurable
  2022-11-30 22:01 ` [PATCH v9 01/12] CI: make Python version configurable Oliver Steffen
@ 2022-11-30 23:46   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-11-30 23:46 UTC (permalink / raw)
  To: devel, osteffen
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

I think you should update Ubuntu-GCC5.yml to use templates/defaults.yml 
in this commit since at this point in time containers are not used yet.

Can you also add a copyright header to defaults.yml? Then it will be 
consistent with other yaml files and in place as the file grows in the 
future.

Thanks,
Michael

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Add a new parameter "usePythonVersion" to the CI job templates.
> This makes it possible to specify the version of Python to use.
> The default value is '', in which case Python will not be downloaded
> at runtime and the one provided by the VM/container image will be used.
> 
> Additionally, add a template .azurepipelines/templates/defaults.yml,
> from which the default Pyhton version string can be obtained.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   .azurepipelines/Windows-VS2019.yml                     | 4 ++++
>   .azurepipelines/templates/defaults.yml                 | 3 +++
>   .azurepipelines/templates/platform-build-run-steps.yml | 6 +++++-
>   .azurepipelines/templates/pr-gate-build-job.yml        | 2 ++
>   .azurepipelines/templates/pr-gate-steps.yml            | 6 ++++--
>   5 files changed, 18 insertions(+), 3 deletions(-)
>   create mode 100644 .azurepipelines/templates/defaults.yml
> 
> diff --git a/.azurepipelines/Windows-VS2019.yml
> b/.azurepipelines/Windows-VS2019.yml
> index e4bd4b1d2283..89bccde82575 100644
> --- a/.azurepipelines/Windows-VS2019.yml
> +++ b/.azurepipelines/Windows-VS2019.yml
> @@ -12,9 +12,13 @@ pr:
>   - master
>   - stable/*
> 
> +variables:
> +  - template: templates/defaults.yml
> +
>   jobs:
>   - template: templates/pr-gate-build-job.yml
>     parameters:
>       tool_chain_tag: 'VS2019'
>       vm_image: 'windows-2019'
>       arch_list: "IA32,X64"
> +    usePythonVersion: ${{ variables.default_python_version }}
> diff --git a/.azurepipelines/templates/defaults.yml
> b/.azurepipelines/templates/defaults.yml
> new file mode 100644
> index 000000000000..314d03e33af8
> --- /dev/null
> +++ b/.azurepipelines/templates/defaults.yml
> @@ -0,0 +1,3 @@
> +
> +variables:
> +  default_python_version: ">=3.10.6"
> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
> b/.azurepipelines/templates/platform-build-run-steps.yml
> index 40a31a509fc5..8803d80cf51c 100644
> --- a/.azurepipelines/templates/platform-build-run-steps.yml
> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> @@ -34,6 +34,9 @@ parameters:
>   - name: extra_install_step
>     type: stepList
>     default: []
> +- name: usePythonVersion
> +  type: string
> +  default: ''
> 
>   steps:
>   - checkout: self
> @@ -42,8 +45,9 @@ steps:
> 
>   - task: UsePythonVersion@0
>     inputs:
> -    versionSpec: ">=3.10.6"
> +    versionSpec: ${{ parameters.usePythonVersion }}
>       architecture: "x64"
> +  condition: ne('${{ parameters.usePythonVersion }}', '')
> 
>   - script: pip install -r pip-requirements.txt --upgrade
>     displayName: 'Install/Upgrade pip modules'
> diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
> b/.azurepipelines/templates/pr-gate-build-job.yml
> index 7f88b41dc8d3..f0ef1142da49 100644
> --- a/.azurepipelines/templates/pr-gate-build-job.yml
> +++ b/.azurepipelines/templates/pr-gate-build-job.yml
> @@ -12,6 +12,7 @@ parameters:
>     tool_chain_tag: ''
>     vm_image: ''
>     arch_list: ''
> +  usePythonVersion: ''
> 
>   # Build step
>   jobs:
> @@ -77,3 +78,4 @@ jobs:
>         build_pkgs: $(Build.Pkgs)
>         build_targets: $(Build.Targets)
>         build_archs: ${{ parameters.arch_list }}
> +      usePythonVersion: ${{ parameters.usePythonVersion }}
> diff --git a/.azurepipelines/templates/pr-gate-steps.yml
> b/.azurepipelines/templates/pr-gate-steps.yml
> index cb431e53fcd1..27a44c06011c 100644
> --- a/.azurepipelines/templates/pr-gate-steps.yml
> +++ b/.azurepipelines/templates/pr-gate-steps.yml
> @@ -12,6 +12,7 @@ parameters:
>     build_pkgs: ''
>     build_targets: ''
>     build_archs: ''
> +  usePythonVersion: ''
> 
>   steps:
>   - checkout: self
> @@ -20,8 +21,9 @@ steps:
> 
>   - task: UsePythonVersion@0
>     inputs:
> -    versionSpec: '>=3.10.6'
> -    architecture: 'x64'
> +    versionSpec: ${{ parameters.usePythonVersion }}
> +    architecture: "x64"
> +  condition: ne('${{ parameters.usePythonVersion }}', '')
> 
>   - script: pip install -r pip-requirements.txt --upgrade
>     displayName: 'Install/Upgrade pip modules'

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 02/12] OvmfPkg: CI: use Python version from defaults template
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
  2022-11-30 22:01 ` [PATCH v9 01/12] CI: make Python version configurable Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-12-01  0:04   ` [edk2-devel] " Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 03/12] EmulatorPkg: " Oliver Steffen
                   ` (9 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Use the default Python version from the defaults template
(.azurepipelines/templates/defaults.yml) in the Windows
CI jobs.

Previous changes to the CI job templates make it necessary
to specify a version number, if Python shall be pulled
at CI runtime.

The Linux CI jobs will use Python from the container image,
so these changes are for Windows only.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index 7d6344d6383d..7e63f419b26b 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -14,6 +14,10 @@ trigger:
 pr:
   - master
   - stable/*
+
+variables:
+  - template: ../../../.azurepipelines/templates/defaults.yml
+
 jobs:
   - job: Platform_CI
     variables:
@@ -133,6 +137,7 @@ jobs:
         build_file: $(Build.File)
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
+        usePythonVersion: ${{ variables.default_python_version }}
         extra_install_step:
         - powershell: choco install qemu --version=2021.5.5;
Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
           displayName: Install QEMU and Set QEMU on path # friendly
name displayed in the UI
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [edk2-devel] [PATCH v9 02/12] OvmfPkg: CI: use Python version from defaults template
  2022-11-30 22:01 ` [PATCH v9 02/12] OvmfPkg: CI: use Python version from defaults template Oliver Steffen
@ 2022-12-01  0:04   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:04 UTC (permalink / raw)
  To: devel, osteffen
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Like patch v9 1/12, I suggest updating Ubuntu-GCC5.yml in 
OvmfPkg/PlatformCI/.azurepipelines to use the template in this patch.

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Use the default Python version from the defaults template
> (.azurepipelines/templates/defaults.yml) in the Windows
> CI jobs.
> 
> Previous changes to the CI job templates make it necessary
> to specify a version number, if Python shall be pulled
> at CI runtime.
> 
> The Linux CI jobs will use Python from the container image,
> so these changes are for Windows only.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 5 +++++
>   1 file changed, 5 insertions(+)
> 
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> index 7d6344d6383d..7e63f419b26b 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> @@ -14,6 +14,10 @@ trigger:
>   pr:
>     - master
>     - stable/*
> +
> +variables:
> +  - template: ../../../.azurepipelines/templates/defaults.yml
> +
>   jobs:
>     - job: Platform_CI
>       variables:
> @@ -133,6 +137,7 @@ jobs:
>           build_file: $(Build.File)
>           build_flags: $(Build.Flags)
>           run_flags: $(Run.Flags)
> +        usePythonVersion: ${{ variables.default_python_version }}
>           extra_install_step:
>           - powershell: choco install qemu --version=2021.5.5;
> Write-Host "##vso[task.prependpath]c:\Program Files\qemu"
>             displayName: Install QEMU and Set QEMU on path # friendly
> name displayed in the UI

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 03/12] EmulatorPkg: CI: use Python version from defaults template
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
  2022-11-30 22:01 ` [PATCH v9 01/12] CI: make Python version configurable Oliver Steffen
  2022-11-30 22:01 ` [PATCH v9 02/12] OvmfPkg: CI: use Python version from defaults template Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-12-01  0:04   ` [edk2-devel] " Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 04/12] CI: add ~/.local/bin to PATH (Linux only) Oliver Steffen
                   ` (8 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Use the default Python version from the defaults template
(.azurepipelines/templates/defaults.yml) in the Windows
CI jobs.

Previous changes to the CI job templates make it necessary
to specify a version number, if Python shall be pulled
at CI runtime.

The Linux CI jobs will use Python from the container image,
so these changes are for Windows only.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
index e7ead06ae266..09960e7c7a6e 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
@@ -16,6 +16,9 @@ pr:
   - master
   - stable/*

+variables:
+  - template: ../../../.azurepipelines/templates/defaults.yml
+
 jobs:
   - job: Platform_CI
     variables:
@@ -128,3 +131,4 @@ jobs:
         build_file: $(Build.File)
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
+        usePythonVersion: ${{ variables.default_python_version }}
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [edk2-devel] [PATCH v9 03/12] EmulatorPkg: CI: use Python version from defaults template
  2022-11-30 22:01 ` [PATCH v9 03/12] EmulatorPkg: " Oliver Steffen
@ 2022-12-01  0:04   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:04 UTC (permalink / raw)
  To: devel, osteffen
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Like patch v9 1/12 & v9 2/12, I suggest updating Ubuntu-GCC5.yml in 
EmulatorPkg/PlatformCI/.azurepipelines to use the template in this patch.

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Use the default Python version from the defaults template
> (.azurepipelines/templates/defaults.yml) in the Windows
> CI jobs.
> 
> Previous changes to the CI job templates make it necessary
> to specify a version number, if Python shall be pulled
> at CI runtime.
> 
> The Linux CI jobs will use Python from the container image,
> so these changes are for Windows only.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> index e7ead06ae266..09960e7c7a6e 100644
> --- a/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Windows-VS2019.yml
> @@ -16,6 +16,9 @@ pr:
>     - master
>     - stable/*
> 
> +variables:
> +  - template: ../../../.azurepipelines/templates/defaults.yml
> +
>   jobs:
>     - job: Platform_CI
>       variables:
> @@ -128,3 +131,4 @@ jobs:
>           build_file: $(Build.File)
>           build_flags: $(Build.Flags)
>           run_flags: $(Run.Flags)
> +        usePythonVersion: ${{ variables.default_python_version }}

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 04/12] CI: add ~/.local/bin to PATH (Linux only)
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (2 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 03/12] EmulatorPkg: " Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-12-01  0:05   ` [edk2-devel] " Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 05/12] CI: Allow running in a container Oliver Steffen
                   ` (7 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Fix pip install under certain conditions.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .azurepipelines/templates/platform-build-run-steps.yml | 6 ++++++
 .azurepipelines/templates/pr-gate-steps.yml            | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
b/.azurepipelines/templates/platform-build-run-steps.yml
index 8803d80cf51c..087f460d7fec 100644
--- a/.azurepipelines/templates/platform-build-run-steps.yml
+++ b/.azurepipelines/templates/platform-build-run-steps.yml
@@ -39,6 +39,12 @@ parameters:
   default: ''

 steps:
+- bash: |
+    echo "##vso[task.prependpath]${HOME}/.local/bin"
+    echo "new PATH=${PATH}"
+  displayName: Set PATH
+  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
+
 - checkout: self
   clean: true
   fetchDepth: 1
diff --git a/.azurepipelines/templates/pr-gate-steps.yml
b/.azurepipelines/templates/pr-gate-steps.yml
index 27a44c06011c..99d52cfa0605 100644
--- a/.azurepipelines/templates/pr-gate-steps.yml
+++ b/.azurepipelines/templates/pr-gate-steps.yml
@@ -15,6 +15,12 @@ parameters:
   usePythonVersion: ''

 steps:
+- bash: |
+    echo "##vso[task.prependpath]${HOME}/.local/bin"
+    echo "new PATH=${PATH}"
+  displayName: Set PATH
+  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
+
 - checkout: self
   clean: true
   fetchDepth: 1
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [edk2-devel] [PATCH v9 04/12] CI: add ~/.local/bin to PATH (Linux only)
  2022-11-30 22:01 ` [PATCH v9 04/12] CI: add ~/.local/bin to PATH (Linux only) Oliver Steffen
@ 2022-12-01  0:05   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:05 UTC (permalink / raw)
  To: devel, osteffen
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Hi Oliver,

I think the commit message is too vague. Can you please add a bit more 
context?

With that:

Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Fix pip install under certain conditions.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   .azurepipelines/templates/platform-build-run-steps.yml | 6 ++++++
>   .azurepipelines/templates/pr-gate-steps.yml            | 6 ++++++
>   2 files changed, 12 insertions(+)
> 
> diff --git a/.azurepipelines/templates/platform-build-run-steps.yml
> b/.azurepipelines/templates/platform-build-run-steps.yml
> index 8803d80cf51c..087f460d7fec 100644
> --- a/.azurepipelines/templates/platform-build-run-steps.yml
> +++ b/.azurepipelines/templates/platform-build-run-steps.yml
> @@ -39,6 +39,12 @@ parameters:
>     default: ''
> 
>   steps:
> +- bash: |
> +    echo "##vso[task.prependpath]${HOME}/.local/bin"
> +    echo "new PATH=${PATH}"
> +  displayName: Set PATH
> +  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
> +
>   - checkout: self
>     clean: true
>     fetchDepth: 1
> diff --git a/.azurepipelines/templates/pr-gate-steps.yml
> b/.azurepipelines/templates/pr-gate-steps.yml
> index 27a44c06011c..99d52cfa0605 100644
> --- a/.azurepipelines/templates/pr-gate-steps.yml
> +++ b/.azurepipelines/templates/pr-gate-steps.yml
> @@ -15,6 +15,12 @@ parameters:
>     usePythonVersion: ''
> 
>   steps:
> +- bash: |
> +    echo "##vso[task.prependpath]${HOME}/.local/bin"
> +    echo "new PATH=${PATH}"
> +  displayName: Set PATH
> +  condition: eq('${{ parameters.tool_chain_tag }}', 'GCC5')
> +
>   - checkout: self
>     clean: true
>     fetchDepth: 1

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 05/12] CI: Allow running in a container.
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (3 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 04/12] CI: add ~/.local/bin to PATH (Linux only) Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-12-01  0:05   ` [edk2-devel] " Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 06/12] BaseTools: CI: Use Fedora 35 container (Linux only) Oliver Steffen
                   ` (6 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Add a parameter of the pr-gate-build-job template to specify a
container image URL.  If the value is not '' (default), then the
jobs will be run inside a container based on that image.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .azurepipelines/templates/pr-gate-build-job.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
b/.azurepipelines/templates/pr-gate-build-job.yml
index f0ef1142da49..5ffcaca7b591 100644
--- a/.azurepipelines/templates/pr-gate-build-job.yml
+++ b/.azurepipelines/templates/pr-gate-build-job.yml
@@ -12,6 +12,7 @@ parameters:
   tool_chain_tag: ''
   vm_image: ''
   arch_list: ''
+  container: ''
   usePythonVersion: ''

 # Build step
@@ -71,6 +72,9 @@ jobs:
   pool:
     vmImage: ${{ parameters.vm_image }}

+  ${{ if not(eq(parameters.container, '')) }}:
+    container: ${{ parameters.container }}
+
   steps:
   - template: pr-gate-steps.yml
     parameters:
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [edk2-devel] [PATCH v9 05/12] CI: Allow running in a container.
  2022-11-30 22:01 ` [PATCH v9 05/12] CI: Allow running in a container Oliver Steffen
@ 2022-12-01  0:05   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:05 UTC (permalink / raw)
  To: devel, osteffen
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Add a parameter of the pr-gate-build-job template to specify a
> container image URL.  If the value is not '' (default), then the
> jobs will be run inside a container based on that image.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   .azurepipelines/templates/pr-gate-build-job.yml | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/.azurepipelines/templates/pr-gate-build-job.yml
> b/.azurepipelines/templates/pr-gate-build-job.yml
> index f0ef1142da49..5ffcaca7b591 100644
> --- a/.azurepipelines/templates/pr-gate-build-job.yml
> +++ b/.azurepipelines/templates/pr-gate-build-job.yml
> @@ -12,6 +12,7 @@ parameters:
>     tool_chain_tag: ''
>     vm_image: ''
>     arch_list: ''
> +  container: ''
>     usePythonVersion: ''
> 
>   # Build step
> @@ -71,6 +72,9 @@ jobs:
>     pool:
>       vmImage: ${{ parameters.vm_image }}
> 
> +  ${{ if not(eq(parameters.container, '')) }}:
> +    container: ${{ parameters.container }}
> +
>     steps:
>     - template: pr-gate-steps.yml
>       parameters:

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 06/12] BaseTools: CI: Use Fedora 35 container (Linux only)
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (4 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 05/12] CI: Allow running in a container Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-12-01  0:05   ` [edk2-devel] " Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 07/12] ArmVirtPkg: " Oliver Steffen
                   ` (5 subsequent siblings)
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Run all Linux based jobs in a container, using a custom Fedora 35 image
(gcc 11). The image is hosted on ghcr.io and the Dockerfiles are
here: https://github.com/tianocore/containers
The version numbers of gcc, iasl, and nasm are pinned to avoid
unintended upgrades during image rebuild.

Do not run apt-get in CI jobs to install qemu and gcc dependencies.
Assume the container image provides these.

Use Python from the container image, do not download at runtime.

Remove BaseTools/Bin/gcc_*_ext_dep.yaml to stop
downloading gcc from external locations; use the
gcc provided by the container image instead.
The container image sets the variable GCC5_*_PREFIX accordingly.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .azurepipelines/Ubuntu-GCC5.yml               |  2 ++
 .../templates/basetools-build-steps.yml       |  9 --------
 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21 ------------------
 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21 ------------------
 ...gcc_loongarch64_unknown_linux_ext_dep.yaml | 22 -------------------
 .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22 -------------------
 6 files changed, 2 insertions(+), 95 deletions(-)
 delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
 delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
 delete mode 100644 BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
 delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml

diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml
index 1acd8d2a46a7..0dd9b74de57a 100644
--- a/.azurepipelines/Ubuntu-GCC5.yml
+++ b/.azurepipelines/Ubuntu-GCC5.yml
@@ -18,5 +18,7 @@ jobs:
   parameters:
     tool_chain_tag: 'GCC5'
     vm_image: 'ubuntu-latest'
+    container: 'ghcr.io/tianocore/containers/fedora-35-build:2113a0e'
+    usePythonVersion: ''  # use Python from the container image
     arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"

diff --git a/.azurepipelines/templates/basetools-build-steps.yml
b/.azurepipelines/templates/basetools-build-steps.yml
index d8c108c6e212..a72758bc3395 100644
--- a/.azurepipelines/templates/basetools-build-steps.yml
+++ b/.azurepipelines/templates/basetools-build-steps.yml
@@ -10,15 +10,6 @@ parameters:
   tool_chain_tag: ''

 steps:
-- ${{ if contains(parameters.tool_chain_tag, 'GCC') }}:
-  - bash: sudo apt-get update
-    displayName: Update apt
-    condition: and(gt(variables.pkg_count, 0), succeeded())
-
-  - bash: sudo apt-get install gcc g++ make uuid-dev
-    displayName: Install required tools
-    condition: and(gt(variables.pkg_count, 0), succeeded())
-
 - task: CmdLine@1
   displayName: Build Base Tools from source
   inputs:
diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
deleted file mode 100644
index ff8a9e868100..000000000000
--- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-## @file
-# Download GCC AARCH64 compiler from Arm's release site
-# Set shell variable GCC5_AARCH64_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope gcc_aarch64_linux
-#
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_aarch64_linux",
-  "type": "web",
-  "name": "gcc_aarch64_linux",
-  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz",
-  "version": "11.2-2022.02",
-  "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
-  "compression_type": "tar",
-  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_AARCH64_INSTALL"
-}
diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
deleted file mode 100644
index 151cbfa4b532..000000000000
--- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-## @file
-# Download GCC ARM compiler from Arm's release site
-# Set shell variable GCC5_ARM_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope gcc_arm_linux
-#
-# Copyright (c) Microsoft Corporation.
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_arm_linux",
-  "type": "web",
-  "name": "gcc_arm_linux",
-  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz",
-  "version": "11.2-2022.02",
-  "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
-  "compression_type": "tar",
-  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_ARM_INSTALL"
-}
diff --git a/BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
b/BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
deleted file mode 100644
index fe9a2448531a..000000000000
--- a/BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-## @file
-# Download GCC LoongArch64 compiler from LoongArch GitHub release site
-# Set shell variable GCC5_LOONGARCH64_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope
gcc_loongarch64_unknown_linux
-#
-# Copyright (c) Microsoft Corporation.
-# Copyright (c) 2022, Loongson Technology Corporation Limited. All
rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_loongarch64_unknown_linux",
-  "type": "web",
-  "name": "gcc_loongarch64_unknown_linux",
-  "source":"https://github.com/loongson/build-tools/releases/download/2022.09.06/loongarch64-clfs-6.3-cross-tools-gcc-full.tar.xz",
-  "version": "13.0.0",
-  "sha256":"27a43c5bb127794f091d0e75da0003c4d0eec28a958d8f2cc7cd290a6e6133ab",
-  "compression_type": "tar",
-  "internal_path": "/cross-tools/",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_LOONGARCH64_INSTALL"
-}
diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
deleted file mode 100644
index 8abbcd7ba040..000000000000
--- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-## @file
-# Download GCC RISCV64 compiler from RISC-V Organization release site
-# Set shell variable GCC5_RISCV64_INSTALL to this folder
-#
-# This is only downloaded when a build activates scope gcc_riscv64_unknown
-#
-# Copyright (c) Microsoft Corporation.
-# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All
rights reserved.<BR>
-# SPDX-License-Identifier: BSD-2-Clause-Patent
-##
-{
-  "scope": "gcc_riscv64_unknown",
-  "type": "web",
-  "name": "gcc_riscv64_unknown",
-  "source": "https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz",
-  "version": "9.2.0",
-  "compression_type": "tar",
-  "sha256": "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
-  "internal_path": "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
-  "flags": ["set_shell_var", ],
-  "var_name": "GCC5_RISCV64_INSTALL"
-}
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [edk2-devel] [PATCH v9 06/12] BaseTools: CI: Use Fedora 35 container (Linux only)
  2022-11-30 22:01 ` [PATCH v9 06/12] BaseTools: CI: Use Fedora 35 container (Linux only) Oliver Steffen
@ 2022-12-01  0:05   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:05 UTC (permalink / raw)
  To: devel, osteffen
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

The changes in .azurepipelines and BaseTools need to be split up into 
separate patches.

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Run all Linux based jobs in a container, using a custom Fedora 35 image
> (gcc 11). The image is hosted on ghcr.io and the Dockerfiles are
> here: https://github.com/tianocore/containers
> The version numbers of gcc, iasl, and nasm are pinned to avoid
> unintended upgrades during image rebuild.
> 
> Do not run apt-get in CI jobs to install qemu and gcc dependencies.
> Assume the container image provides these.
> 
> Use Python from the container image, do not download at runtime.
> 
> Remove BaseTools/Bin/gcc_*_ext_dep.yaml to stop
> downloading gcc from external locations; use the
> gcc provided by the container image instead.
> The container image sets the variable GCC5_*_PREFIX accordingly.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   .azurepipelines/Ubuntu-GCC5.yml               |  2 ++
>   .../templates/basetools-build-steps.yml       |  9 --------
>   BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml  | 21 ------------------
>   BaseTools/Bin/gcc_arm_linux_ext_dep.yaml      | 21 ------------------
>   ...gcc_loongarch64_unknown_linux_ext_dep.yaml | 22 -------------------
>   .../Bin/gcc_riscv64_unknown_ext_dep.yaml      | 22 -------------------
>   6 files changed, 2 insertions(+), 95 deletions(-)
>   delete mode 100644 BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
>   delete mode 100644 BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
>   delete mode 100644 BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
>   delete mode 100644 BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> 
> diff --git a/.azurepipelines/Ubuntu-GCC5.yml b/.azurepipelines/Ubuntu-GCC5.yml
> index 1acd8d2a46a7..0dd9b74de57a 100644
> --- a/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/.azurepipelines/Ubuntu-GCC5.yml
> @@ -18,5 +18,7 @@ jobs:
>     parameters:
>       tool_chain_tag: 'GCC5'
>       vm_image: 'ubuntu-latest'
> +    container: 'ghcr.io/tianocore/containers/fedora-35-build:2113a0e'
> +    usePythonVersion: ''  # use Python from the container image
>       arch_list: "IA32,X64,ARM,AARCH64,RISCV64,LOONGARCH64"
> 
> diff --git a/.azurepipelines/templates/basetools-build-steps.yml
> b/.azurepipelines/templates/basetools-build-steps.yml
> index d8c108c6e212..a72758bc3395 100644
> --- a/.azurepipelines/templates/basetools-build-steps.yml
> +++ b/.azurepipelines/templates/basetools-build-steps.yml
> @@ -10,15 +10,6 @@ parameters:
>     tool_chain_tag: ''
> 
>   steps:
> -- ${{ if contains(parameters.tool_chain_tag, 'GCC') }}:
> -  - bash: sudo apt-get update
> -    displayName: Update apt
> -    condition: and(gt(variables.pkg_count, 0), succeeded())
> -
> -  - bash: sudo apt-get install gcc g++ make uuid-dev
> -    displayName: Install required tools
> -    condition: and(gt(variables.pkg_count, 0), succeeded())
> -
>   - task: CmdLine@1
>     displayName: Build Base Tools from source
>     inputs:
> diff --git a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> deleted file mode 100644
> index ff8a9e868100..000000000000
> --- a/BaseTools/Bin/gcc_aarch64_linux_ext_dep.yaml
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -## @file
> -# Download GCC AARCH64 compiler from Arm's release site
> -# Set shell variable GCC5_AARCH64_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope gcc_aarch64_linux
> -#
> -# Copyright (c) Microsoft Corporation.
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_aarch64_linux",
> -  "type": "web",
> -  "name": "gcc_aarch64_linux",
> -  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu.tar.xz",
> -  "version": "11.2-2022.02",
> -  "sha256": "52dbac3eb71dbe0916f60a8c5ab9b7dc9b66b3ce513047baa09fae56234e53f3",
> -  "compression_type": "tar",
> -  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-aarch64-none-linux-gnu/",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_AARCH64_INSTALL"
> -}
> diff --git a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> deleted file mode 100644
> index 151cbfa4b532..000000000000
> --- a/BaseTools/Bin/gcc_arm_linux_ext_dep.yaml
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -## @file
> -# Download GCC ARM compiler from Arm's release site
> -# Set shell variable GCC5_ARM_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope gcc_arm_linux
> -#
> -# Copyright (c) Microsoft Corporation.
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_arm_linux",
> -  "type": "web",
> -  "name": "gcc_arm_linux",
> -  "source": "https://developer.arm.com/-/media/Files/downloads/gnu/11.2-2022.02/binrel/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf.tar.xz",
> -  "version": "11.2-2022.02",
> -  "sha256": "c254f7199261fe76c32ef42187502839bda7efad0a66646cf739d074eff45fad",
> -  "compression_type": "tar",
> -  "internal_path": "/gcc-arm-11.2-2022.02-x86_64-arm-none-linux-gnueabihf/",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_ARM_INSTALL"
> -}
> diff --git a/BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
> b/BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
> deleted file mode 100644
> index fe9a2448531a..000000000000
> --- a/BaseTools/Bin/gcc_loongarch64_unknown_linux_ext_dep.yaml
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -## @file
> -# Download GCC LoongArch64 compiler from LoongArch GitHub release site
> -# Set shell variable GCC5_LOONGARCH64_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope
> gcc_loongarch64_unknown_linux
> -#
> -# Copyright (c) Microsoft Corporation.
> -# Copyright (c) 2022, Loongson Technology Corporation Limited. All
> rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_loongarch64_unknown_linux",
> -  "type": "web",
> -  "name": "gcc_loongarch64_unknown_linux",
> -  "source":"https://github.com/loongson/build-tools/releases/download/2022.09.06/loongarch64-clfs-6.3-cross-tools-gcc-full.tar.xz",
> -  "version": "13.0.0",
> -  "sha256":"27a43c5bb127794f091d0e75da0003c4d0eec28a958d8f2cc7cd290a6e6133ab",
> -  "compression_type": "tar",
> -  "internal_path": "/cross-tools/",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_LOONGARCH64_INSTALL"
> -}
> diff --git a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> b/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> deleted file mode 100644
> index 8abbcd7ba040..000000000000
> --- a/BaseTools/Bin/gcc_riscv64_unknown_ext_dep.yaml
> +++ /dev/null
> @@ -1,22 +0,0 @@
> -## @file
> -# Download GCC RISCV64 compiler from RISC-V Organization release site
> -# Set shell variable GCC5_RISCV64_INSTALL to this folder
> -#
> -# This is only downloaded when a build activates scope gcc_riscv64_unknown
> -#
> -# Copyright (c) Microsoft Corporation.
> -# Copyright (c) 2020, Hewlett Packard Enterprise Development LP. All
> rights reserved.<BR>
> -# SPDX-License-Identifier: BSD-2-Clause-Patent
> -##
> -{
> -  "scope": "gcc_riscv64_unknown",
> -  "type": "web",
> -  "name": "gcc_riscv64_unknown",
> -  "source": "https://raw.githubusercontent.com/riscv/riscv-uefi-edk2-docs/master/gcc-riscv-edk2-ci-toolchain/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu.tar.xz",
> -  "version": "9.2.0",
> -  "compression_type": "tar",
> -  "sha256": "28373643b69f0ce008273c3dc63f172aa1121952f1b9ae94d7485ac94af7f344",
> -  "internal_path": "/gcc-riscv-9.2.0-2020.04-x86_64_riscv64-unknown-gnu",
> -  "flags": ["set_shell_var", ],
> -  "var_name": "GCC5_RISCV64_INSTALL"
> -}

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 07/12] ArmVirtPkg: CI: Use Fedora 35 container (Linux only)
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (5 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 06/12] BaseTools: CI: Use Fedora 35 container (Linux only) Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-11-30 22:01 ` [PATCH v9 08/12] OvmfPkg: " Oliver Steffen
                   ` (4 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Run all Linux based jobs in a container, using a custom Fedora 35 image
(gcc 11). The image is hosted on ghcr.io and the Dockerfiles are
here: https://github.com/tianocore/containers
The version numbers of gcc, iasl, and nasm are pinned to avoid
unintended upgrades during image rebuild.

Do not run apt-get in CI jobs to install qemu and gcc dependencies.
Assume the container image provides these.

Use Python from the container image, do not download at runtime.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index b07e3199f143..6d75502b5628 100644
--- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -75,6 +75,8 @@ jobs:
     pool:
       vmImage: $(vm_image)

+    container: 'ghcr.io/tianocore/containers/fedora-35-test:2113a0e'
+
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
       parameters:
@@ -85,7 +87,4 @@ jobs:
         build_file: $(Build.File)
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
-        extra_install_step:
-        - bash: sudo apt-get install qemu
-          displayName: Install qemu
-          condition: and(gt(variables.pkg_count, 0), succeeded())
+        usePythonVersion: '' # use Python from the container image
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v9 08/12] OvmfPkg: CI: Use Fedora 35 container (Linux only)
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (6 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 07/12] ArmVirtPkg: " Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-11-30 22:01 ` [PATCH v9 09/12] EmulatorPkg: " Oliver Steffen
                   ` (3 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Run all Linux based jobs in a container, using a custom Fedora 35 image
(gcc 11). The image is hosted on ghcr.io and the Dockerfiles are
here: https://github.com/tianocore/containers
The version numbers of gcc, iasl, and nasm are pinned to avoid
unintended upgrades during image rebuild.

Do not run apt-get in CI jobs to install qemu and gcc dependencies.
Assume the container image provides these.

Use Python from the container image, do not download at runtime.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 7160d95f7e04..984782aa7d19 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -177,6 +177,8 @@ jobs:
     pool:
       vmImage: $(vm_image)

+    container: 'ghcr.io/tianocore/containers/fedora-35-test:2113a0e'
+
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
       parameters:
@@ -187,7 +189,4 @@ jobs:
         build_file: $(Build.File)
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
-        extra_install_step:
-        - bash: sudo apt-get install qemu
-          displayName: Install qemu
-          condition: and(gt(variables.pkg_count, 0), succeeded())
+        usePythonVersion: '' # use Python from the container image
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v9 09/12] EmulatorPkg: CI: Use Fedora 35 container (Linux only)
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (7 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 08/12] OvmfPkg: " Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-11-30 22:01 ` [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC Oliver Steffen
                   ` (2 subsequent siblings)
  11 siblings, 0 replies; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Run all Linux based jobs in a container, using a custom Fedora 35 image
(gcc 11). The image is hosted on ghcr.io and the Dockerfiles are
here: https://github.com/tianocore/containers
The version numbers of gcc, iasl, and nasm are pinned to avoid
unintended upgrades during image rebuild.

Use Python from the container image, do not download at runtime.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 416c15e70840..e58bb5b55245 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -75,6 +75,8 @@ jobs:
     pool:
       vmImage: $(vm_image)

+    container: 'ghcr.io/tianocore/containers/fedora-35-test:2113a0e'
+
     steps:
     - template: ../../../.azurepipelines/templates/platform-build-run-steps.yml
       parameters:
@@ -85,3 +87,4 @@ jobs:
         build_file: $(Build.File)
         build_flags: $(Build.Flags)
         run_flags: $(Run.Flags)
+        usePythonVersion: '' # use Python from the container image
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (8 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 09/12] EmulatorPkg: " Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-12-01  0:02   ` Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 11/12] CI: use latest vm_image (Linux only) Oliver Steffen
  2022-11-30 22:01 ` [PATCH v9 12/12] do not merge: modify *.dsc to trigger CI Oliver Steffen
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

All ext_dep.yml files for gcc have been removed and gcc
is expected to be installed on the system (GCC5_*_PREFIX
may indicate the location).
No need to adjust the toolchain scopes for Linux builds
anymore.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 .pytool/CISettings.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
index 76ac2b09dba6..d87c8e838e61 100644
--- a/.pytool/CISettings.py
+++ b/.pytool/CISettings.py
@@ -169,15 +169,6 @@ class Settings(CiBuildSettingsManager,
UpdateSettingsManager, SetupSettingsManag
             else:
                 logging.warning("Falling back to using in-tree BaseTools")

-            if is_linux and self.ActualToolChainTag.upper().startswith("GCC"):
-                if "AARCH64" in self.ActualArchitectures:
-                    scopes += ("gcc_aarch64_linux",)
-                if "ARM" in self.ActualArchitectures:
-                    scopes += ("gcc_arm_linux",)
-                if "RISCV64" in self.ActualArchitectures:
-                    scopes += ("gcc_riscv64_unknown",)
-                if "LOONGARCH64" in self.ActualArchitectures:
-                    scopes += ("gcc_loongarch64_unknown_linux",)
             self.ActualScopes = scopes
         return self.ActualScopes

-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC
  2022-11-30 22:01 ` [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC Oliver Steffen
@ 2022-12-01  0:02   ` Michael Kubacki
  0 siblings, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:02 UTC (permalink / raw)
  To: Oliver Steffen, devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Not a big deal but I think it would be cleaner to remove the scopes in a 
commit before the ext_dep files are actually removed.

For the changes in this patch:

Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> All ext_dep.yml files for gcc have been removed and gcc
> is expected to be installed on the system (GCC5_*_PREFIX
> may indicate the location).
> No need to adjust the toolchain scopes for Linux builds
> anymore.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   .pytool/CISettings.py | 9 ---------
>   1 file changed, 9 deletions(-)
> 
> diff --git a/.pytool/CISettings.py b/.pytool/CISettings.py
> index 76ac2b09dba6..d87c8e838e61 100644
> --- a/.pytool/CISettings.py
> +++ b/.pytool/CISettings.py
> @@ -169,15 +169,6 @@ class Settings(CiBuildSettingsManager,
> UpdateSettingsManager, SetupSettingsManag
>               else:
>                   logging.warning("Falling back to using in-tree BaseTools")
> 
> -            if is_linux and self.ActualToolChainTag.upper().startswith("GCC"):
> -                if "AARCH64" in self.ActualArchitectures:
> -                    scopes += ("gcc_aarch64_linux",)
> -                if "ARM" in self.ActualArchitectures:
> -                    scopes += ("gcc_arm_linux",)
> -                if "RISCV64" in self.ActualArchitectures:
> -                    scopes += ("gcc_riscv64_unknown",)
> -                if "LOONGARCH64" in self.ActualArchitectures:
> -                    scopes += ("gcc_loongarch64_unknown_linux",)
>               self.ActualScopes = scopes
>           return self.ActualScopes
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 11/12] CI: use latest vm_image (Linux only)
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (9 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-11-30 23:41   ` Michael Kubacki
  2022-12-01  0:03   ` Michael Kubacki
  2022-11-30 22:01 ` [PATCH v9 12/12] do not merge: modify *.dsc to trigger CI Oliver Steffen
  11 siblings, 2 replies; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Switch over to `ubuntu-latest` as the vm_image for Linux
CI jobs (EmulatorPkg, ArmVirtPkg, OvmfPkg).
The previously used ubuntu-18.04 will not be available
after Dec 1st 2022.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml  | 2 +-
 EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 2 +-
 OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 6d75502b5628..568b61768d67 100644
--- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -19,7 +19,7 @@ jobs:
   - job: Platform_CI
     variables:
       package: 'ArmVirtPkg'
-      vm_image: 'ubuntu-18.04'
+      vm_image: 'ubuntu-22.04'
       should_run: true
       run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"

diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index e58bb5b55245..4d92f5fd5478 100644
--- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -19,7 +19,7 @@ jobs:
   - job: Platform_CI
     variables:
       package: 'EmulatorPkg'
-      vm_image: 'ubuntu-18.04'
+      vm_image: 'ubuntu-22.04'
       should_run: false
       run_flags: "MAKE_STARTUP_NSH=TRUE"

diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
index 984782aa7d19..865a7458e971 100644
--- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
+++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
@@ -19,7 +19,7 @@ jobs:
   - job: Platform_CI
     variables:
       package: 'OvmfPkg'
-      vm_image: 'ubuntu-18.04'
+      vm_image: 'ubuntu-22.04'
       should_run: true
       run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"

-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v9 11/12] CI: use latest vm_image (Linux only)
  2022-11-30 22:01 ` [PATCH v9 11/12] CI: use latest vm_image (Linux only) Oliver Steffen
@ 2022-11-30 23:41   ` Michael Kubacki
  2022-12-01  0:03   ` Michael Kubacki
  1 sibling, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-11-30 23:41 UTC (permalink / raw)
  To: Oliver Steffen, devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Hi Oliver,

This patch is still touching several packages in one commit.

Thanks,
Michael

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Switch over to `ubuntu-latest` as the vm_image for Linux
> CI jobs (EmulatorPkg, ArmVirtPkg, OvmfPkg).
> The previously used ubuntu-18.04 will not be available
> after Dec 1st 2022.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml  | 2 +-
>   EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 2 +-
>   OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml     | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index 6d75502b5628..568b61768d67 100644
> --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -19,7 +19,7 @@ jobs:
>     - job: Platform_CI
>       variables:
>         package: 'ArmVirtPkg'
> -      vm_image: 'ubuntu-18.04'
> +      vm_image: 'ubuntu-22.04'
>         should_run: true
>         run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"
> 
> diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index e58bb5b55245..4d92f5fd5478 100644
> --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -19,7 +19,7 @@ jobs:
>     - job: Platform_CI
>       variables:
>         package: 'EmulatorPkg'
> -      vm_image: 'ubuntu-18.04'
> +      vm_image: 'ubuntu-22.04'
>         should_run: false
>         run_flags: "MAKE_STARTUP_NSH=TRUE"
> 
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index 984782aa7d19..865a7458e971 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -19,7 +19,7 @@ jobs:
>     - job: Platform_CI
>       variables:
>         package: 'OvmfPkg'
> -      vm_image: 'ubuntu-18.04'
> +      vm_image: 'ubuntu-22.04'
>         should_run: true
>         run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* Re: [PATCH v9 11/12] CI: use latest vm_image (Linux only)
  2022-11-30 22:01 ` [PATCH v9 11/12] CI: use latest vm_image (Linux only) Oliver Steffen
  2022-11-30 23:41   ` Michael Kubacki
@ 2022-12-01  0:03   ` Michael Kubacki
  1 sibling, 0 replies; 22+ messages in thread
From: Michael Kubacki @ 2022-12-01  0:03 UTC (permalink / raw)
  To: Oliver Steffen, devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Ray Ni, Sami Mujawar, Sean Brogan,
	Sunil V L, Yuwei Chen, Zhiguang Liu, Pawel Polawski,
	Chris Fernald

Please update the commit message to `ubuntu-22.04` instead of 
`ubuntu-latest` since you updated in the image in the file from the 
original patch.

Reviewed-by: Michael Kubacki <michael.kubacki@microsoft.com>

On 11/30/2022 5:01 PM, Oliver Steffen wrote:
> Switch over to `ubuntu-latest` as the vm_image for Linux
> CI jobs (EmulatorPkg, ArmVirtPkg, OvmfPkg).
> The previously used ubuntu-18.04 will not be available
> after Dec 1st 2022.
> 
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>   ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml  | 2 +-
>   EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml | 2 +-
>   OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml     | 2 +-
>   3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index 6d75502b5628..568b61768d67 100644
> --- a/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/ArmVirtPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -19,7 +19,7 @@ jobs:
>     - job: Platform_CI
>       variables:
>         package: 'ArmVirtPkg'
> -      vm_image: 'ubuntu-18.04'
> +      vm_image: 'ubuntu-22.04'
>         should_run: true
>         run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"
> 
> diff --git a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index e58bb5b55245..4d92f5fd5478 100644
> --- a/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/EmulatorPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -19,7 +19,7 @@ jobs:
>     - job: Platform_CI
>       variables:
>         package: 'EmulatorPkg'
> -      vm_image: 'ubuntu-18.04'
> +      vm_image: 'ubuntu-22.04'
>         should_run: false
>         run_flags: "MAKE_STARTUP_NSH=TRUE"
> 
> diff --git a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> index 984782aa7d19..865a7458e971 100644
> --- a/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> +++ b/OvmfPkg/PlatformCI/.azurepipelines/Ubuntu-GCC5.yml
> @@ -19,7 +19,7 @@ jobs:
>     - job: Platform_CI
>       variables:
>         package: 'OvmfPkg'
> -      vm_image: 'ubuntu-18.04'
> +      vm_image: 'ubuntu-22.04'
>         should_run: true
>         run_flags: "MAKE_STARTUP_NSH=TRUE QEMU_HEADLESS=TRUE"
> 

^ permalink raw reply	[flat|nested] 22+ messages in thread

* [PATCH v9 12/12] do not merge: modify *.dsc to trigger CI
       [not found] <20221130220125.1112760-1-osteffen@redhat.com>
                   ` (10 preceding siblings ...)
  2022-11-30 22:01 ` [PATCH v9 11/12] CI: use latest vm_image (Linux only) Oliver Steffen
@ 2022-11-30 22:01 ` Oliver Steffen
  2022-11-30 22:04   ` Oliver Steffen
  11 siblings, 1 reply; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:01 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald, Oliver Steffen

Modify all *.dsc files to make sure all parts of the CI actually run.
This is only needed to trigger the CI in the PR and shall not be merged.

Signed-off-by: Oliver Steffen <osteffen@redhat.com>
---
 ArmPkg/ArmPkg.dsc                                          | 1 +
 ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc         | 1 +
 ArmPlatformPkg/ArmPlatformPkg.dsc                          | 1 +
 ArmVirtPkg/ArmVirtCloudHv.dsc                              | 1 +
 ArmVirtPkg/ArmVirtKvmTool.dsc                              | 1 +
 ArmVirtPkg/ArmVirtQemu.dsc                                 | 1 +
 ArmVirtPkg/ArmVirtQemuKernel.dsc                           | 1 +
 ArmVirtPkg/ArmVirtXen.dsc                                  | 1 +
 CryptoPkg/CryptoPkg.dsc                                    | 1 +
 CryptoPkg/Test/CryptoPkgHostUnitTest.dsc                   | 1 +
 DynamicTablesPkg/DynamicTablesPkg.dsc                      | 1 +
 EmbeddedPkg/EmbeddedPkg.dsc                                | 1 +
 EmulatorPkg/EmulatorPkg.dsc                                | 1 +
 FatPkg/FatPkg.dsc                                          | 1 +
 FmpDevicePkg/FmpDevicePkg.dsc                              | 1 +
 FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc                 | 1 +
 IntelFsp2Pkg/IntelFsp2Pkg.dsc                              | 1 +
 IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc                    | 1 +
 IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc                | 1 +
 MdeModulePkg/MdeModulePkg.dsc                              | 1 +
 MdeModulePkg/Test/MdeModulePkgHostTest.dsc                 | 1 +
 MdePkg/MdePkg.dsc                                          | 1 +
 MdePkg/Test/MdePkgHostTest.dsc                             | 1 +
 NetworkPkg/NetworkPkg.dsc                                  | 1 +
 OvmfPkg/AmdSev/AmdSevX64.dsc                               | 1 +
 OvmfPkg/Bhyve/BhyveX64.dsc                                 | 1 +
 OvmfPkg/CloudHv/CloudHvX64.dsc                             | 1 +
 OvmfPkg/IntelTdx/IntelTdxX64.dsc                           | 1 +
 OvmfPkg/Microvm/MicrovmX64.dsc                             | 1 +
 OvmfPkg/OvmfPkgIa32.dsc                                    | 1 +
 OvmfPkg/OvmfPkgIa32X64.dsc                                 | 1 +
 OvmfPkg/OvmfPkgX64.dsc                                     | 1 +
 OvmfPkg/OvmfXen.dsc                                        | 1 +
 PcAtChipsetPkg/PcAtChipsetPkg.dsc                          | 1 +
 PrmPkg/PrmPkg.dsc                                          | 1 +
 PrmPkg/Test/PrmPkgHostTest.dsc                             | 1 +
 RedfishPkg/RedfishPkg.dsc                                  | 1 +
 SecurityPkg/SecurityPkg.dsc                                | 1 +
 SecurityPkg/Test/SecurityPkgHostTest.dsc                   | 1 +
 ShellPkg/ShellPkg.dsc                                      | 1 +
 SignedCapsulePkg/SignedCapsulePkg.dsc                      | 1 +
 SourceLevelDebugPkg/SourceLevelDebugPkg.dsc                | 1 +
 StandaloneMmPkg/StandaloneMmPkg.dsc                        | 1 +
 UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc                     | 1 +
 UefiCpuPkg/UefiCpuPkg.dsc                                  | 1 +
 UefiPayloadPkg/UefiPayloadPkg.dsc                          | 1 +
 UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc | 1 +
 UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc              | 1 +
 48 files changed, 48 insertions(+)

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index ac24ebce4892..69bead376e41 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -169,3 +169,4 @@ [Components.AARCH64]

 [Components.AARCH64, Components.ARM]
   ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
+# modified
diff --git a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
b/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
index 2818ce65db98..afab1f8617f0 100644
--- a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
+++ b/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
@@ -48,3 +48,4 @@ [LibraryClasses]

 [Components.common]
   ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.inf
+# modified
diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc
b/ArmPlatformPkg/ArmPlatformPkg.dsc
index ddd128f9e606..cfb5fcf19f0f 100644
--- a/ArmPlatformPkg/ArmPlatformPkg.dsc
+++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
@@ -127,3 +127,4 @@ [Components.common]
   ArmPlatformPkg/PrePi/PeiUniCore.inf

   ArmPlatformPkg/Library/ArmMaliDp/ArmMaliDp.inf
+# modified
diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
index 7ca7a391d9cf..03db645de2b9 100644
--- a/ArmVirtPkg/ArmVirtCloudHv.dsc
+++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
@@ -363,3 +363,4 @@ [Components.AARCH64]
     <LibraryClasses>
       NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
+# modified
diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
index 2ba00bd08ff1..a881a64cf59d 100644
--- a/ArmVirtPkg/ArmVirtKvmTool.dsc
+++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
@@ -378,3 +378,4 @@ [Components.common]
   #
   ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf
 !endif
+# modified
diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
index f77443229e8e..0e7c658f64d6 100644
--- a/ArmVirtPkg/ArmVirtQemu.dsc
+++ b/ArmVirtPkg/ArmVirtQemu.dsc
@@ -576,3 +576,4 @@ [Components.AARCH64]
     <LibraryClasses>
       NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
+# modified
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
index f5db3ac432f3..78914c8e5ccf 100644
--- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
+++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
@@ -464,3 +464,4 @@ [Components.AARCH64]
     <LibraryClasses>
       NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
   }
+# modified
diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
index 58088af6ea3a..0dfdf7a5a3f2 100644
--- a/ArmVirtPkg/ArmVirtXen.dsc
+++ b/ArmVirtPkg/ArmVirtXen.dsc
@@ -236,3 +236,4 @@ [Components.common]
 !if $(ARCH) == AARCH64
   ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
 !endif
+# modified
diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
index 3b245979c34c..13395c0fc860 100644
--- a/CryptoPkg/CryptoPkg.dsc
+++ b/CryptoPkg/CryptoPkg.dsc
@@ -577,3 +577,4 @@ [Components.IA32, Components.X64]
 [BuildOptions]
   RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
index 3ed3e9b75d84..347679457806 100644
--- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
+++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
@@ -45,3 +45,4 @@ [Components]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc
b/DynamicTablesPkg/DynamicTablesPkg.dsc
index 07cc837552f5..d65545bb610b 100644
--- a/DynamicTablesPkg/DynamicTablesPkg.dsc
+++ b/DynamicTablesPkg/DynamicTablesPkg.dsc
@@ -55,3 +55,4 @@ [BuildOptions]
   # Inhibit C6305: Potential mismatch between sizeof and countof quantities.
   *_VS2017_*_CC_FLAGS = /wd6305 /analyze
 !endif
+# modified
diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index e9062cacbb42..34913020ad3a 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -252,3 +252,4 @@ [Components.ARM, Components.AARCH64]

 [Components.IA32, Components.X64, Components.ARM]
   EmbeddedPkg/GdbStub/GdbStub.inf
+# modified
diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
index b44435d7e6ee..b3adf1b45cdc 100644
--- a/EmulatorPkg/EmulatorPkg.dsc
+++ b/EmulatorPkg/EmulatorPkg.dsc
@@ -505,3 +505,4 @@ [BuildOptions]
   GCC:DEBUG_CLANGPDB_*_DLINK_FLAGS =
/EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000
   GCC:NOOPT_CLANGPDB_*_DLINK_FLAGS =
/EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000
 !endif
+# modified
diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc
index 076b57797220..cf3c8c2e4f01 100644
--- a/FatPkg/FatPkg.dsc
+++ b/FatPkg/FatPkg.dsc
@@ -82,3 +82,4 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64]
 [Components]
   FatPkg/FatPei/FatPei.inf
   FatPkg/EnhancedFatDxe/Fat.inf
+# modified
diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
index f9f26c54bb79..5a551cfcf2ea 100644
--- a/FmpDevicePkg/FmpDevicePkg.dsc
+++ b/FmpDevicePkg/FmpDevicePkg.dsc
@@ -182,3 +182,4 @@ [Components]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
b/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
index 83574399be7c..11a0052dfe94 100644
--- a/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
+++ b/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
@@ -26,3 +26,4 @@ [Components]
   # Build HOST_APPLICATION that tests the FmpDependencyLib
   #
   FmpDevicePkg/Test/UnitTest/Library/FmpDependencyLib/FmpDependencyLibUnitTestsHost.inf
+# modified
diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
index 0713f0028dd5..e431c9f58b37 100644
--- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc
+++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
@@ -83,3 +83,4 @@ [PcdsFixedAtBuild.common]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
index 961576c9a73a..dc19274bce32 100644
--- a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
+++ b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
@@ -469,3 +469,4 @@ [BuildOptions]
   *_GCC5_IA32_DLINK_FLAGS = -no-pie
   *_GCC5_IA32_ASLCC_FLAGS = -fno-pic
   *_GCC5_IA32_ASLDLINK_FLAGS = -no-pie
+# modified
diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
index b1fc2291c85d..e6ae040e640e 100644
--- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
+++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
@@ -103,3 +103,4 @@ [PcdsFixedAtBuild.common]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
index 659482ab737f..0bfe6a8069c6 100644
--- a/MdeModulePkg/MdeModulePkg.dsc
+++ b/MdeModulePkg/MdeModulePkg.dsc
@@ -518,3 +518,4 @@ [Components.X64]

 [BuildOptions]

+# modified
diff --git a/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
b/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
index c9ec835df65d..cef58f782499 100644
--- a/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
+++ b/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
@@ -47,3 +47,4 @@ [Components]
       UefiSortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
       DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
   }
+# modified
diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
index 32a852dc466e..cc9f91c89c04 100644
--- a/MdePkg/MdePkg.dsc
+++ b/MdePkg/MdePkg.dsc
@@ -191,3 +191,4 @@ [Components.ARM, Components.AARCH64]
   MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf

 [BuildOptions]
+# modified
diff --git a/MdePkg/Test/MdePkgHostTest.dsc b/MdePkg/Test/MdePkgHostTest.dsc
index b8b186dd8b17..80c7561e8138 100644
--- a/MdePkg/Test/MdePkgHostTest.dsc
+++ b/MdePkg/Test/MdePkgHostTest.dsc
@@ -34,3 +34,4 @@ [Components]
   # Build HOST_APPLICATION Libraries
   #
   MdePkg/Library/BaseLib/UnitTestHostBaseLib.inf
+# modified
diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc
index 6c231c97b544..6ed46219a53b 100644
--- a/NetworkPkg/NetworkPkg.dsc
+++ b/NetworkPkg/NetworkPkg.dsc
@@ -132,3 +132,4 @@ [Components]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
index 8f7cae787e97..fedf5f485daa 100644
--- a/OvmfPkg/AmdSev/AmdSevX64.dsc
+++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
@@ -767,3 +767,4 @@ [Components]
   # TPM support
   #
 !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+# modified
diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
index e3bb367b6bf6..108bf986ca98 100644
--- a/OvmfPkg/Bhyve/BhyveX64.dsc
+++ b/OvmfPkg/Bhyve/BhyveX64.dsc
@@ -823,3 +823,4 @@ [Components]
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
   }

+# modified
diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
index ce277cb2398b..2fe678716c59 100644
--- a/OvmfPkg/CloudHv/CloudHvX64.dsc
+++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
@@ -946,3 +946,4 @@ [Components]
   # TPM support
   #
 !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+# modified
diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
index 345892651520..ced079a75a6e 100644
--- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
+++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
@@ -776,3 +776,4 @@ [Components]
       HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
       NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
   }
+# modified
diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
index 994a02d30107..ed37c6ad4e17 100644
--- a/OvmfPkg/Microvm/MicrovmX64.dsc
+++ b/OvmfPkg/Microvm/MicrovmX64.dsc
@@ -889,3 +889,4 @@ [Components]
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
   }
+# modified
diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
index 6f774baf90f5..44601ef6ef86 100644
--- a/OvmfPkg/OvmfPkgIa32.dsc
+++ b/OvmfPkg/OvmfPkgIa32.dsc
@@ -1019,3 +1019,4 @@ [Components]
 !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
   OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf
 !endif
+# modified
diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
index c851764dec05..63c6dee86f1a 100644
--- a/OvmfPkg/OvmfPkgIa32X64.dsc
+++ b/OvmfPkg/OvmfPkgIa32X64.dsc
@@ -1033,3 +1033,4 @@ [Components.X64]
   # TPM support
   #
 !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+# modified
diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
index 63c3a47aea30..da4fd17ac522 100644
--- a/OvmfPkg/OvmfPkgX64.dsc
+++ b/OvmfPkg/OvmfPkgX64.dsc
@@ -1103,3 +1103,4 @@ [Components]
   # TPM support
   #
 !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
+# modified
diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
index 8bb497088bd2..c363a5c64ca9 100644
--- a/OvmfPkg/OvmfXen.dsc
+++ b/OvmfPkg/OvmfXen.dsc
@@ -762,3 +762,4 @@ [Components]
     <LibraryClasses>
       NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
   }
+# modified
diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc
b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
index 451e60ddc857..82742eb56112 100644
--- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc
+++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
@@ -60,3 +60,4 @@ [Components]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/PrmPkg/PrmPkg.dsc b/PrmPkg/PrmPkg.dsc
index 677100504584..ffca8c8c8c9b 100644
--- a/PrmPkg/PrmPkg.dsc
+++ b/PrmPkg/PrmPkg.dsc
@@ -157,3 +157,4 @@ [Components.AARCH64]
 [BuildOptions]
 # Force deprecated interfaces off
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/PrmPkg/Test/PrmPkgHostTest.dsc b/PrmPkg/Test/PrmPkgHostTest.dsc
index 75d9046cc2e2..e130ac7da528 100644
--- a/PrmPkg/Test/PrmPkgHostTest.dsc
+++ b/PrmPkg/Test/PrmPkgHostTest.dsc
@@ -31,3 +31,4 @@ [Components]
   #
   PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTestHost.inf
   PrmPkg/Library/DxePrmModuleDiscoveryLib/UnitTest/DxePrmModuleDiscoveryLibUnitTestHost.inf
+# modified
diff --git a/RedfishPkg/RedfishPkg.dsc b/RedfishPkg/RedfishPkg.dsc
index 16139146ff83..bbf231a9841d 100644
--- a/RedfishPkg/RedfishPkg.dsc
+++ b/RedfishPkg/RedfishPkg.dsc
@@ -60,3 +60,4 @@ [Components]
   RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.inf

   !include RedfishPkg/Redfish.dsc.inc
+# modified
diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
index 30d911d8a141..ff6e96ca72da 100644
--- a/SecurityPkg/SecurityPkg.dsc
+++ b/SecurityPkg/SecurityPkg.dsc
@@ -407,3 +407,4 @@ [BuildOptions]
    MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:256
   INTEL:*_*_IA32_DLINK_FLAGS = /ALIGN:256
         *_*_*_CC_FLAGS       = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/SecurityPkg/Test/SecurityPkgHostTest.dsc
b/SecurityPkg/Test/SecurityPkgHostTest.dsc
index c4df01fe1b73..e1b352e09214 100644
--- a/SecurityPkg/Test/SecurityPkgHostTest.dsc
+++ b/SecurityPkg/Test/SecurityPkgHostTest.dsc
@@ -36,3 +36,4 @@ [Components]
       PlatformPKProtectionLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf
       UefiLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf
   }
+# modified
diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
index dd0d88603f11..6adbf22c993a 100644
--- a/ShellPkg/ShellPkg.dsc
+++ b/ShellPkg/ShellPkg.dsc
@@ -158,3 +158,4 @@ [Components]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc
b/SignedCapsulePkg/SignedCapsulePkg.dsc
index 8a27207a6f20..1621dcf8f972 100644
--- a/SignedCapsulePkg/SignedCapsulePkg.dsc
+++ b/SignedCapsulePkg/SignedCapsulePkg.dsc
@@ -253,3 +253,4 @@ [Components]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
index eba64a7b7877..d2db27dd2094 100644
--- a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
+++ b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
@@ -110,3 +110,4 @@ [Components.common]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc
b/StandaloneMmPkg/StandaloneMmPkg.dsc
index 8012f93b7dcc..c060d7e0f782 100644
--- a/StandaloneMmPkg/StandaloneMmPkg.dsc
+++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
@@ -142,3 +142,4 @@ [BuildOptions.ARM]
 [BuildOptions.X64]
   MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
   GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
+# modified
diff --git a/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
b/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
index e72e4cd622c0..2aeb3beca0d4 100644
--- a/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
+++ b/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
@@ -38,3 +38,4 @@ [Components]
   # Build HOST_APPLICATION that tests the CpuPageTableLib
   #
   UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHost.inf
+# modified
diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
index 67b0ce46e455..d945f1e20b14 100644
--- a/UefiCpuPkg/UefiCpuPkg.dsc
+++ b/UefiCpuPkg/UefiCpuPkg.dsc
@@ -189,3 +189,4 @@ [Components.X64]

 [BuildOptions]
   *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
+# modified
diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc
b/UefiPayloadPkg/UefiPayloadPkg.dsc
index 723a50a42284..84164c8bebaf 100644
--- a/UefiPayloadPkg/UefiPayloadPkg.dsc
+++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
@@ -890,3 +890,4 @@ [Components.X64]
   }

 !endif
+# modified
diff --git a/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
b/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
index 708ef7f9ab35..f5baa2912f7a 100644
--- a/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
+++ b/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
@@ -36,3 +36,4 @@ [Components]
   UnitTestFrameworkPkg/Library/Posix/DebugLibPosix/DebugLibPosix.inf
   UnitTestFrameworkPkg/Library/Posix/MemoryAllocationLibPosix/MemoryAllocationLibPosix.inf
   UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLibCmocka.inf
+# modified
diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
index a76e31d97d5d..083369cb147a 100644
--- a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
+++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
@@ -40,3 +40,4 @@ [Components]
   UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestPei.inf
   UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestSmm.inf
   UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestUefiShell.inf
+# modified
-- 
2.38.1


^ permalink raw reply related	[flat|nested] 22+ messages in thread

* Re: [PATCH v9 12/12] do not merge: modify *.dsc to trigger CI
  2022-11-30 22:01 ` [PATCH v9 12/12] do not merge: modify *.dsc to trigger CI Oliver Steffen
@ 2022-11-30 22:04   ` Oliver Steffen
  0 siblings, 0 replies; 22+ messages in thread
From: Oliver Steffen @ 2022-11-30 22:04 UTC (permalink / raw)
  To: devel
  Cc: Andrew Fish, Ard Biesheuvel, Bob Feng, Daniel Schaefer,
	Gerd Hoffmann, Jiewen Yao, Jordan Justen, Leif Lindholm,
	Liming Gao, Michael D Kinney, Michael Kubacki, Ray Ni,
	Sami Mujawar, Sean Brogan, Sunil V L, Yuwei Chen, Zhiguang Liu,
	Pawel Polawski, Chris Fernald

Please ignore this patch. I did not intend to send it.

-Oliver

On Wed, Nov 30, 2022 at 11:01 PM Oliver Steffen <osteffen@redhat.com> wrote:
>
> Modify all *.dsc files to make sure all parts of the CI actually run.
> This is only needed to trigger the CI in the PR and shall not be merged.
>
> Signed-off-by: Oliver Steffen <osteffen@redhat.com>
> ---
>  ArmPkg/ArmPkg.dsc                                          | 1 +
>  ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc         | 1 +
>  ArmPlatformPkg/ArmPlatformPkg.dsc                          | 1 +
>  ArmVirtPkg/ArmVirtCloudHv.dsc                              | 1 +
>  ArmVirtPkg/ArmVirtKvmTool.dsc                              | 1 +
>  ArmVirtPkg/ArmVirtQemu.dsc                                 | 1 +
>  ArmVirtPkg/ArmVirtQemuKernel.dsc                           | 1 +
>  ArmVirtPkg/ArmVirtXen.dsc                                  | 1 +
>  CryptoPkg/CryptoPkg.dsc                                    | 1 +
>  CryptoPkg/Test/CryptoPkgHostUnitTest.dsc                   | 1 +
>  DynamicTablesPkg/DynamicTablesPkg.dsc                      | 1 +
>  EmbeddedPkg/EmbeddedPkg.dsc                                | 1 +
>  EmulatorPkg/EmulatorPkg.dsc                                | 1 +
>  FatPkg/FatPkg.dsc                                          | 1 +
>  FmpDevicePkg/FmpDevicePkg.dsc                              | 1 +
>  FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc                 | 1 +
>  IntelFsp2Pkg/IntelFsp2Pkg.dsc                              | 1 +
>  IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc                    | 1 +
>  IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc                | 1 +
>  MdeModulePkg/MdeModulePkg.dsc                              | 1 +
>  MdeModulePkg/Test/MdeModulePkgHostTest.dsc                 | 1 +
>  MdePkg/MdePkg.dsc                                          | 1 +
>  MdePkg/Test/MdePkgHostTest.dsc                             | 1 +
>  NetworkPkg/NetworkPkg.dsc                                  | 1 +
>  OvmfPkg/AmdSev/AmdSevX64.dsc                               | 1 +
>  OvmfPkg/Bhyve/BhyveX64.dsc                                 | 1 +
>  OvmfPkg/CloudHv/CloudHvX64.dsc                             | 1 +
>  OvmfPkg/IntelTdx/IntelTdxX64.dsc                           | 1 +
>  OvmfPkg/Microvm/MicrovmX64.dsc                             | 1 +
>  OvmfPkg/OvmfPkgIa32.dsc                                    | 1 +
>  OvmfPkg/OvmfPkgIa32X64.dsc                                 | 1 +
>  OvmfPkg/OvmfPkgX64.dsc                                     | 1 +
>  OvmfPkg/OvmfXen.dsc                                        | 1 +
>  PcAtChipsetPkg/PcAtChipsetPkg.dsc                          | 1 +
>  PrmPkg/PrmPkg.dsc                                          | 1 +
>  PrmPkg/Test/PrmPkgHostTest.dsc                             | 1 +
>  RedfishPkg/RedfishPkg.dsc                                  | 1 +
>  SecurityPkg/SecurityPkg.dsc                                | 1 +
>  SecurityPkg/Test/SecurityPkgHostTest.dsc                   | 1 +
>  ShellPkg/ShellPkg.dsc                                      | 1 +
>  SignedCapsulePkg/SignedCapsulePkg.dsc                      | 1 +
>  SourceLevelDebugPkg/SourceLevelDebugPkg.dsc                | 1 +
>  StandaloneMmPkg/StandaloneMmPkg.dsc                        | 1 +
>  UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc                     | 1 +
>  UefiCpuPkg/UefiCpuPkg.dsc                                  | 1 +
>  UefiPayloadPkg/UefiPayloadPkg.dsc                          | 1 +
>  UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc | 1 +
>  UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc              | 1 +
>  48 files changed, 48 insertions(+)
>
> diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
> index ac24ebce4892..69bead376e41 100644
> --- a/ArmPkg/ArmPkg.dsc
> +++ b/ArmPkg/ArmPkg.dsc
> @@ -169,3 +169,4 @@ [Components.AARCH64]
>
>  [Components.AARCH64, Components.ARM]
>    ArmPkg/Library/StandaloneMmMmuLib/ArmMmuStandaloneMmLib.inf
> +# modified
> diff --git a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc b/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
> index 2818ce65db98..afab1f8617f0 100644
> --- a/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
> +++ b/ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.dsc
> @@ -48,3 +48,4 @@ [LibraryClasses]
>
>  [Components.common]
>    ArmPkg/Drivers/ArmCrashDumpDxe/ArmCrashDumpDxe.inf
> +# modified
> diff --git a/ArmPlatformPkg/ArmPlatformPkg.dsc b/ArmPlatformPkg/ArmPlatformPkg.dsc
> index ddd128f9e606..cfb5fcf19f0f 100644
> --- a/ArmPlatformPkg/ArmPlatformPkg.dsc
> +++ b/ArmPlatformPkg/ArmPlatformPkg.dsc
> @@ -127,3 +127,4 @@ [Components.common]
>    ArmPlatformPkg/PrePi/PeiUniCore.inf
>
>    ArmPlatformPkg/Library/ArmMaliDp/ArmMaliDp.inf
> +# modified
> diff --git a/ArmVirtPkg/ArmVirtCloudHv.dsc b/ArmVirtPkg/ArmVirtCloudHv.dsc
> index 7ca7a391d9cf..03db645de2b9 100644
> --- a/ArmVirtPkg/ArmVirtCloudHv.dsc
> +++ b/ArmVirtPkg/ArmVirtCloudHv.dsc
> @@ -363,3 +363,4 @@ [Components.AARCH64]
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    }
> +# modified
> diff --git a/ArmVirtPkg/ArmVirtKvmTool.dsc b/ArmVirtPkg/ArmVirtKvmTool.dsc
> index 2ba00bd08ff1..a881a64cf59d 100644
> --- a/ArmVirtPkg/ArmVirtKvmTool.dsc
> +++ b/ArmVirtPkg/ArmVirtKvmTool.dsc
> @@ -378,3 +378,4 @@ [Components.common]
>    #
>    ArmVirtPkg/KvmtoolCfgMgrDxe/ConfigurationManagerDxe.inf
>  !endif
> +# modified
> diff --git a/ArmVirtPkg/ArmVirtQemu.dsc b/ArmVirtPkg/ArmVirtQemu.dsc
> index f77443229e8e..0e7c658f64d6 100644
> --- a/ArmVirtPkg/ArmVirtQemu.dsc
> +++ b/ArmVirtPkg/ArmVirtQemu.dsc
> @@ -576,3 +576,4 @@ [Components.AARCH64]
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    }
> +# modified
> diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> index f5db3ac432f3..78914c8e5ccf 100644
> --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc
> +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc
> @@ -464,3 +464,4 @@ [Components.AARCH64]
>      <LibraryClasses>
>        NULL|OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.inf
>    }
> +# modified
> diff --git a/ArmVirtPkg/ArmVirtXen.dsc b/ArmVirtPkg/ArmVirtXen.dsc
> index 58088af6ea3a..0dfdf7a5a3f2 100644
> --- a/ArmVirtPkg/ArmVirtXen.dsc
> +++ b/ArmVirtPkg/ArmVirtXen.dsc
> @@ -236,3 +236,4 @@ [Components.common]
>  !if $(ARCH) == AARCH64
>    ArmVirtPkg/XenAcpiPlatformDxe/XenAcpiPlatformDxe.inf
>  !endif
> +# modified
> diff --git a/CryptoPkg/CryptoPkg.dsc b/CryptoPkg/CryptoPkg.dsc
> index 3b245979c34c..13395c0fc860 100644
> --- a/CryptoPkg/CryptoPkg.dsc
> +++ b/CryptoPkg/CryptoPkg.dsc
> @@ -577,3 +577,4 @@ [Components.IA32, Components.X64]
>  [BuildOptions]
>    RELEASE_*_*_CC_FLAGS = -DMDEPKG_NDEBUG
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> index 3ed3e9b75d84..347679457806 100644
> --- a/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> +++ b/CryptoPkg/Test/CryptoPkgHostUnitTest.dsc
> @@ -45,3 +45,4 @@ [Components]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/DynamicTablesPkg/DynamicTablesPkg.dsc b/DynamicTablesPkg/DynamicTablesPkg.dsc
> index 07cc837552f5..d65545bb610b 100644
> --- a/DynamicTablesPkg/DynamicTablesPkg.dsc
> +++ b/DynamicTablesPkg/DynamicTablesPkg.dsc
> @@ -55,3 +55,4 @@ [BuildOptions]
>    # Inhibit C6305: Potential mismatch between sizeof and countof quantities.
>    *_VS2017_*_CC_FLAGS = /wd6305 /analyze
>  !endif
> +# modified
> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
> index e9062cacbb42..34913020ad3a 100644
> --- a/EmbeddedPkg/EmbeddedPkg.dsc
> +++ b/EmbeddedPkg/EmbeddedPkg.dsc
> @@ -252,3 +252,4 @@ [Components.ARM, Components.AARCH64]
>
>  [Components.IA32, Components.X64, Components.ARM]
>    EmbeddedPkg/GdbStub/GdbStub.inf
> +# modified
> diff --git a/EmulatorPkg/EmulatorPkg.dsc b/EmulatorPkg/EmulatorPkg.dsc
> index b44435d7e6ee..b3adf1b45cdc 100644
> --- a/EmulatorPkg/EmulatorPkg.dsc
> +++ b/EmulatorPkg/EmulatorPkg.dsc
> @@ -505,3 +505,4 @@ [BuildOptions]
>    GCC:DEBUG_CLANGPDB_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000
>    GCC:NOOPT_CLANGPDB_*_DLINK_FLAGS = /EXPORT:InitializeDriver=$(IMAGE_ENTRY_POINT) /BASE:0x10000
>  !endif
> +# modified
> diff --git a/FatPkg/FatPkg.dsc b/FatPkg/FatPkg.dsc
> index 076b57797220..cf3c8c2e4f01 100644
> --- a/FatPkg/FatPkg.dsc
> +++ b/FatPkg/FatPkg.dsc
> @@ -82,3 +82,4 @@ [LibraryClasses.ARM, LibraryClasses.AARCH64]
>  [Components]
>    FatPkg/FatPei/FatPei.inf
>    FatPkg/EnhancedFatDxe/Fat.inf
> +# modified
> diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc
> index f9f26c54bb79..5a551cfcf2ea 100644
> --- a/FmpDevicePkg/FmpDevicePkg.dsc
> +++ b/FmpDevicePkg/FmpDevicePkg.dsc
> @@ -182,3 +182,4 @@ [Components]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc b/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
> index 83574399be7c..11a0052dfe94 100644
> --- a/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
> +++ b/FmpDevicePkg/Test/FmpDeviceHostPkgTest.dsc
> @@ -26,3 +26,4 @@ [Components]
>    # Build HOST_APPLICATION that tests the FmpDependencyLib
>    #
>    FmpDevicePkg/Test/UnitTest/Library/FmpDependencyLib/FmpDependencyLibUnitTestsHost.inf
> +# modified
> diff --git a/IntelFsp2Pkg/IntelFsp2Pkg.dsc b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> index 0713f0028dd5..e431c9f58b37 100644
> --- a/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> +++ b/IntelFsp2Pkg/IntelFsp2Pkg.dsc
> @@ -83,3 +83,4 @@ [PcdsFixedAtBuild.common]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> index 961576c9a73a..dc19274bce32 100644
> --- a/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> +++ b/IntelFsp2Pkg/Tools/Tests/QemuFspPkg.dsc
> @@ -469,3 +469,4 @@ [BuildOptions]
>    *_GCC5_IA32_DLINK_FLAGS = -no-pie
>    *_GCC5_IA32_ASLCC_FLAGS = -fno-pic
>    *_GCC5_IA32_ASLDLINK_FLAGS = -no-pie
> +# modified
> diff --git a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> index b1fc2291c85d..e6ae040e640e 100644
> --- a/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> +++ b/IntelFsp2WrapperPkg/IntelFsp2WrapperPkg.dsc
> @@ -103,3 +103,4 @@ [PcdsFixedAtBuild.common]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/MdeModulePkg/MdeModulePkg.dsc b/MdeModulePkg/MdeModulePkg.dsc
> index 659482ab737f..0bfe6a8069c6 100644
> --- a/MdeModulePkg/MdeModulePkg.dsc
> +++ b/MdeModulePkg/MdeModulePkg.dsc
> @@ -518,3 +518,4 @@ [Components.X64]
>
>  [BuildOptions]
>
> +# modified
> diff --git a/MdeModulePkg/Test/MdeModulePkgHostTest.dsc b/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
> index c9ec835df65d..cef58f782499 100644
> --- a/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
> +++ b/MdeModulePkg/Test/MdeModulePkgHostTest.dsc
> @@ -47,3 +47,4 @@ [Components]
>        UefiSortLib|MdeModulePkg/Library/UefiSortLib/UefiSortLib.inf
>        DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLib.inf
>    }
> +# modified
> diff --git a/MdePkg/MdePkg.dsc b/MdePkg/MdePkg.dsc
> index 32a852dc466e..cc9f91c89c04 100644
> --- a/MdePkg/MdePkg.dsc
> +++ b/MdePkg/MdePkg.dsc
> @@ -191,3 +191,4 @@ [Components.ARM, Components.AARCH64]
>    MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
>
>  [BuildOptions]
> +# modified
> diff --git a/MdePkg/Test/MdePkgHostTest.dsc b/MdePkg/Test/MdePkgHostTest.dsc
> index b8b186dd8b17..80c7561e8138 100644
> --- a/MdePkg/Test/MdePkgHostTest.dsc
> +++ b/MdePkg/Test/MdePkgHostTest.dsc
> @@ -34,3 +34,4 @@ [Components]
>    # Build HOST_APPLICATION Libraries
>    #
>    MdePkg/Library/BaseLib/UnitTestHostBaseLib.inf
> +# modified
> diff --git a/NetworkPkg/NetworkPkg.dsc b/NetworkPkg/NetworkPkg.dsc
> index 6c231c97b544..6ed46219a53b 100644
> --- a/NetworkPkg/NetworkPkg.dsc
> +++ b/NetworkPkg/NetworkPkg.dsc
> @@ -132,3 +132,4 @@ [Components]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/OvmfPkg/AmdSev/AmdSevX64.dsc b/OvmfPkg/AmdSev/AmdSevX64.dsc
> index 8f7cae787e97..fedf5f485daa 100644
> --- a/OvmfPkg/AmdSev/AmdSevX64.dsc
> +++ b/OvmfPkg/AmdSev/AmdSevX64.dsc
> @@ -767,3 +767,4 @@ [Components]
>    # TPM support
>    #
>  !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> +# modified
> diff --git a/OvmfPkg/Bhyve/BhyveX64.dsc b/OvmfPkg/Bhyve/BhyveX64.dsc
> index e3bb367b6bf6..108bf986ca98 100644
> --- a/OvmfPkg/Bhyve/BhyveX64.dsc
> +++ b/OvmfPkg/Bhyve/BhyveX64.dsc
> @@ -823,3 +823,4 @@ [Components]
>        NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>    }
>
> +# modified
> diff --git a/OvmfPkg/CloudHv/CloudHvX64.dsc b/OvmfPkg/CloudHv/CloudHvX64.dsc
> index ce277cb2398b..2fe678716c59 100644
> --- a/OvmfPkg/CloudHv/CloudHvX64.dsc
> +++ b/OvmfPkg/CloudHv/CloudHvX64.dsc
> @@ -946,3 +946,4 @@ [Components]
>    # TPM support
>    #
>  !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> +# modified
> diff --git a/OvmfPkg/IntelTdx/IntelTdxX64.dsc b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> index 345892651520..ced079a75a6e 100644
> --- a/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> +++ b/OvmfPkg/IntelTdx/IntelTdxX64.dsc
> @@ -776,3 +776,4 @@ [Components]
>        HashLib|SecurityPkg/Library/HashLibTdx/HashLibTdx.inf
>        NULL|SecurityPkg/Library/HashInstanceLibSha384/HashInstanceLibSha384.inf
>    }
> +# modified
> diff --git a/OvmfPkg/Microvm/MicrovmX64.dsc b/OvmfPkg/Microvm/MicrovmX64.dsc
> index 994a02d30107..ed37c6ad4e17 100644
> --- a/OvmfPkg/Microvm/MicrovmX64.dsc
> +++ b/OvmfPkg/Microvm/MicrovmX64.dsc
> @@ -889,3 +889,4 @@ [Components]
>      <LibraryClasses>
>        NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>    }
> +# modified
> diff --git a/OvmfPkg/OvmfPkgIa32.dsc b/OvmfPkg/OvmfPkgIa32.dsc
> index 6f774baf90f5..44601ef6ef86 100644
> --- a/OvmfPkg/OvmfPkgIa32.dsc
> +++ b/OvmfPkg/OvmfPkgIa32.dsc
> @@ -1019,3 +1019,4 @@ [Components]
>  !if $(LOAD_X64_ON_IA32_ENABLE) == TRUE
>    OvmfPkg/CompatImageLoaderDxe/CompatImageLoaderDxe.inf
>  !endif
> +# modified
> diff --git a/OvmfPkg/OvmfPkgIa32X64.dsc b/OvmfPkg/OvmfPkgIa32X64.dsc
> index c851764dec05..63c6dee86f1a 100644
> --- a/OvmfPkg/OvmfPkgIa32X64.dsc
> +++ b/OvmfPkg/OvmfPkgIa32X64.dsc
> @@ -1033,3 +1033,4 @@ [Components.X64]
>    # TPM support
>    #
>  !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> +# modified
> diff --git a/OvmfPkg/OvmfPkgX64.dsc b/OvmfPkg/OvmfPkgX64.dsc
> index 63c3a47aea30..da4fd17ac522 100644
> --- a/OvmfPkg/OvmfPkgX64.dsc
> +++ b/OvmfPkg/OvmfPkgX64.dsc
> @@ -1103,3 +1103,4 @@ [Components]
>    # TPM support
>    #
>  !include OvmfPkg/OvmfTpmComponentsDxe.dsc.inc
> +# modified
> diff --git a/OvmfPkg/OvmfXen.dsc b/OvmfPkg/OvmfXen.dsc
> index 8bb497088bd2..c363a5c64ca9 100644
> --- a/OvmfPkg/OvmfXen.dsc
> +++ b/OvmfPkg/OvmfXen.dsc
> @@ -762,3 +762,4 @@ [Components]
>      <LibraryClasses>
>        NULL|MdeModulePkg/Library/VarCheckUefiLib/VarCheckUefiLib.inf
>    }
> +# modified
> diff --git a/PcAtChipsetPkg/PcAtChipsetPkg.dsc b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
> index 451e60ddc857..82742eb56112 100644
> --- a/PcAtChipsetPkg/PcAtChipsetPkg.dsc
> +++ b/PcAtChipsetPkg/PcAtChipsetPkg.dsc
> @@ -60,3 +60,4 @@ [Components]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/PrmPkg/PrmPkg.dsc b/PrmPkg/PrmPkg.dsc
> index 677100504584..ffca8c8c8c9b 100644
> --- a/PrmPkg/PrmPkg.dsc
> +++ b/PrmPkg/PrmPkg.dsc
> @@ -157,3 +157,4 @@ [Components.AARCH64]
>  [BuildOptions]
>  # Force deprecated interfaces off
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/PrmPkg/Test/PrmPkgHostTest.dsc b/PrmPkg/Test/PrmPkgHostTest.dsc
> index 75d9046cc2e2..e130ac7da528 100644
> --- a/PrmPkg/Test/PrmPkgHostTest.dsc
> +++ b/PrmPkg/Test/PrmPkgHostTest.dsc
> @@ -31,3 +31,4 @@ [Components]
>    #
>    PrmPkg/Library/DxePrmContextBufferLib/UnitTest/DxePrmContextBufferLibUnitTestHost.inf
>    PrmPkg/Library/DxePrmModuleDiscoveryLib/UnitTest/DxePrmModuleDiscoveryLibUnitTestHost.inf
> +# modified
> diff --git a/RedfishPkg/RedfishPkg.dsc b/RedfishPkg/RedfishPkg.dsc
> index 16139146ff83..bbf231a9841d 100644
> --- a/RedfishPkg/RedfishPkg.dsc
> +++ b/RedfishPkg/RedfishPkg.dsc
> @@ -60,3 +60,4 @@ [Components]
>    RedfishPkg/PrivateLibrary/RedfishLib/RedfishLib.inf
>
>    !include RedfishPkg/Redfish.dsc.inc
> +# modified
> diff --git a/SecurityPkg/SecurityPkg.dsc b/SecurityPkg/SecurityPkg.dsc
> index 30d911d8a141..ff6e96ca72da 100644
> --- a/SecurityPkg/SecurityPkg.dsc
> +++ b/SecurityPkg/SecurityPkg.dsc
> @@ -407,3 +407,4 @@ [BuildOptions]
>     MSFT:*_*_IA32_DLINK_FLAGS = /ALIGN:256
>    INTEL:*_*_IA32_DLINK_FLAGS = /ALIGN:256
>          *_*_*_CC_FLAGS       = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/SecurityPkg/Test/SecurityPkgHostTest.dsc b/SecurityPkg/Test/SecurityPkgHostTest.dsc
> index c4df01fe1b73..e1b352e09214 100644
> --- a/SecurityPkg/Test/SecurityPkgHostTest.dsc
> +++ b/SecurityPkg/Test/SecurityPkgHostTest.dsc
> @@ -36,3 +36,4 @@ [Components]
>        PlatformPKProtectionLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockPlatformPKProtectionLib.inf
>        UefiLib|SecurityPkg/Library/SecureBootVariableLib/UnitTest/MockUefiLib.inf
>    }
> +# modified
> diff --git a/ShellPkg/ShellPkg.dsc b/ShellPkg/ShellPkg.dsc
> index dd0d88603f11..6adbf22c993a 100644
> --- a/ShellPkg/ShellPkg.dsc
> +++ b/ShellPkg/ShellPkg.dsc
> @@ -158,3 +158,4 @@ [Components]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/SignedCapsulePkg/SignedCapsulePkg.dsc b/SignedCapsulePkg/SignedCapsulePkg.dsc
> index 8a27207a6f20..1621dcf8f972 100644
> --- a/SignedCapsulePkg/SignedCapsulePkg.dsc
> +++ b/SignedCapsulePkg/SignedCapsulePkg.dsc
> @@ -253,3 +253,4 @@ [Components]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> index eba64a7b7877..d2db27dd2094 100644
> --- a/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> +++ b/SourceLevelDebugPkg/SourceLevelDebugPkg.dsc
> @@ -110,3 +110,4 @@ [Components.common]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/StandaloneMmPkg/StandaloneMmPkg.dsc b/StandaloneMmPkg/StandaloneMmPkg.dsc
> index 8012f93b7dcc..c060d7e0f782 100644
> --- a/StandaloneMmPkg/StandaloneMmPkg.dsc
> +++ b/StandaloneMmPkg/StandaloneMmPkg.dsc
> @@ -142,3 +142,4 @@ [BuildOptions.ARM]
>  [BuildOptions.X64]
>    MSFT:*_*_*_DLINK_FLAGS = /ALIGN:4096
>    GCC:*_GCC*_*_DLINK_FLAGS = -z common-page-size=0x1000
> +# modified
> diff --git a/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc b/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
> index e72e4cd622c0..2aeb3beca0d4 100644
> --- a/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
> +++ b/UefiCpuPkg/Test/UefiCpuPkgHostTest.dsc
> @@ -38,3 +38,4 @@ [Components]
>    # Build HOST_APPLICATION that tests the CpuPageTableLib
>    #
>    UefiCpuPkg/Library/CpuPageTableLib/UnitTest/CpuPageTableLibUnitTestHost.inf
> +# modified
> diff --git a/UefiCpuPkg/UefiCpuPkg.dsc b/UefiCpuPkg/UefiCpuPkg.dsc
> index 67b0ce46e455..d945f1e20b14 100644
> --- a/UefiCpuPkg/UefiCpuPkg.dsc
> +++ b/UefiCpuPkg/UefiCpuPkg.dsc
> @@ -189,3 +189,4 @@ [Components.X64]
>
>  [BuildOptions]
>    *_*_*_CC_FLAGS = -D DISABLE_NEW_DEPRECATED_INTERFACES
> +# modified
> diff --git a/UefiPayloadPkg/UefiPayloadPkg.dsc b/UefiPayloadPkg/UefiPayloadPkg.dsc
> index 723a50a42284..84164c8bebaf 100644
> --- a/UefiPayloadPkg/UefiPayloadPkg.dsc
> +++ b/UefiPayloadPkg/UefiPayloadPkg.dsc
> @@ -890,3 +890,4 @@ [Components.X64]
>    }
>
>  !endif
> +# modified
> diff --git a/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc b/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
> index 708ef7f9ab35..f5baa2912f7a 100644
> --- a/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
> +++ b/UnitTestFrameworkPkg/Test/UnitTestFrameworkPkgHostTest.dsc
> @@ -36,3 +36,4 @@ [Components]
>    UnitTestFrameworkPkg/Library/Posix/DebugLibPosix/DebugLibPosix.inf
>    UnitTestFrameworkPkg/Library/Posix/MemoryAllocationLibPosix/MemoryAllocationLibPosix.inf
>    UnitTestFrameworkPkg/Library/UnitTestLib/UnitTestLibCmocka.inf
> +# modified
> diff --git a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
> index a76e31d97d5d..083369cb147a 100644
> --- a/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
> +++ b/UnitTestFrameworkPkg/UnitTestFrameworkPkg.dsc
> @@ -40,3 +40,4 @@ [Components]
>    UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestPei.inf
>    UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestSmm.inf
>    UnitTestFrameworkPkg/Test/UnitTest/Sample/SampleUnitTest/SampleUnitTestUefiShell.inf
> +# modified
> --
> 2.38.1
>


^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2022-12-01  0:05 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20221130220125.1112760-1-osteffen@redhat.com>
2022-11-30 22:01 ` [PATCH v9 01/12] CI: make Python version configurable Oliver Steffen
2022-11-30 23:46   ` [edk2-devel] " Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 02/12] OvmfPkg: CI: use Python version from defaults template Oliver Steffen
2022-12-01  0:04   ` [edk2-devel] " Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 03/12] EmulatorPkg: " Oliver Steffen
2022-12-01  0:04   ` [edk2-devel] " Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 04/12] CI: add ~/.local/bin to PATH (Linux only) Oliver Steffen
2022-12-01  0:05   ` [edk2-devel] " Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 05/12] CI: Allow running in a container Oliver Steffen
2022-12-01  0:05   ` [edk2-devel] " Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 06/12] BaseTools: CI: Use Fedora 35 container (Linux only) Oliver Steffen
2022-12-01  0:05   ` [edk2-devel] " Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 07/12] ArmVirtPkg: " Oliver Steffen
2022-11-30 22:01 ` [PATCH v9 08/12] OvmfPkg: " Oliver Steffen
2022-11-30 22:01 ` [PATCH v9 09/12] EmulatorPkg: " Oliver Steffen
2022-11-30 22:01 ` [PATCH v9 10/12] .pytool: CISettings.py: don't add scopes for GCC Oliver Steffen
2022-12-01  0:02   ` Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 11/12] CI: use latest vm_image (Linux only) Oliver Steffen
2022-11-30 23:41   ` Michael Kubacki
2022-12-01  0:03   ` Michael Kubacki
2022-11-30 22:01 ` [PATCH v9 12/12] do not merge: modify *.dsc to trigger CI Oliver Steffen
2022-11-30 22:04   ` Oliver Steffen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox