Skip to content

Commit 663b851

Browse files
authored
Add container logic for matrix builds and enable containers for others (#59)
- Add logic to use container build for GCC matrix dependent builds - Enable container build on all GCC CI pipelines - Add devcontainer file to file sync Depends on: microsoft/mu_basecore#199 microsoft/mu_common_intel_min_platform#80 microsoft/mu_plus#118 microsoft/mu_silicon_arm_tiano#32 microsoft/mu_silicon_intel_tiano#29 microsoft/mu_tiano_plus#67
1 parent f327f74 commit 663b851

8 files changed

Lines changed: 43 additions & 2 deletions

File tree

.sync/Files.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -375,3 +375,21 @@ group:
375375
microsoft/mu_silicon_intel_tiano
376376
microsoft/mu_tiano_platforms
377377
microsoft/mu_tiano_plus
378+
379+
# Development Container - Common for CI based repos
380+
- files:
381+
- source: .sync/devcontainer/devcontainer.json
382+
dest: .devcontainer/devcontainer.json
383+
repos: |
384+
microsoft/mu_basecore
385+
microsoft/mu_common_intel_min_platform
386+
microsoft/mu_crypto_release
387+
microsoft/mu_feature_config
388+
microsoft/mu_feature_ipmi
389+
microsoft/mu_feature_uefi_variable
390+
microsoft/mu_oem_sample
391+
microsoft/mu_plus
392+
microsoft/mu_silicon_arm_tiano
393+
microsoft/mu_silicon_intel_tiano
394+
microsoft/mu_tiano_plus
395+
microsoft/mu_feature_mm_supv

.sync/Version.njk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,6 @@
3131

3232
{# The git ref value that files dependent on this repo will use. #}
3333
{% set mu_devops = "v1.1.1" %}
34+
35+
{# The version of the fedora-35-build container to use. #}
36+
{% set linux_build_container = "ghcr.io/tianocore/containers/fedora-35-build:2113a0e" %}

.sync/azure_pipelines/custom/mu_feature_config/Ubuntu-GCC5.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,4 @@ jobs:
4545
custom_job_name: ubuntu
4646
root_package_folder: SetupDataPkg/Tools
4747
vm_image: $(vm_image)
48+
container_build: true

.sync/azure_pipelines/custom/mu_feature_mm_supv/Ubuntu-GCC5.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,4 @@ jobs:
3636
target_list: DEBUG,RELEASE,NO-TARGET,NOOPT
3737
tool_chain_tag: $(tool_chain_tag)
3838
vm_image: $(vm_image)
39+
container_build: true

.sync/azure_pipelines/custom/mu_oem_sample/Ubuntu-GCC5.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ jobs:
3333
do_ci_setup: true
3434
do_non_ci_setup: true
3535
extra_steps:
36-
- script: sudo apt-get install mingw-w64
36+
- script: sudo microdnf install --assumeyes mingw64-gcc
3737
displayName: Install Windows Resource Compiler for Linux
3838
packages: OemPkg
3939
target_list: DEBUG,RELEASE,NO-TARGET,NOOPT
4040
tool_chain_tag: $(tool_chain_tag)
4141
vm_image: $(vm_image)
42+
container_build: true

.sync/azure_pipelines/custom/mu_tiano_platforms/Ubuntu-GCC5.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,4 @@ jobs:
3939
tool_chain_tag: $(tool_chain_tag)
4040
vm_image: ubuntu-latest
4141
container_build: true
42+

.sync/azure_pipelines/matrix_dependent/Ubuntu-GCC5.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ resources:
2323
endpoint: microsoft
2424
name: microsoft/mu_devops
2525
ref: refs/tags/{{ sync_version.mu_devops }}
26+
containers:
27+
- container: linux-gcc
28+
image: {{ sync_version.linux_build_container }}
2629

2730
variables:
2831
- group: architectures-arm-64-x86-64
@@ -35,8 +38,9 @@ jobs:
3538
extra_build_args: CODE_COVERAGE=TRUE CC_HTML=TRUE
3639
extra_install_step:
3740
- script: |
38-
sudo apt-get install -y mingw-w64 lcov
41+
sudo microdnf install --assumeyes mingw64-gcc lcov
3942
pip install lcov_cobertura pycobertura
4043
displayName: Install Windows Resource Compiler for Linux & Code Coverage Tools
4144
tool_chain_tag: $(tool_chain_tag)
4245
vm_image: $(vm_image)
46+
container_image: linux-gcc
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
{
2+
"image": "ghcr.io/tianocore/containers/fedora-35-dev:latest",
3+
"postCreateCommand": "git config --global --add safe.directory * && pip install --upgrade -r pip-requirements.txt",
4+
"customizations": {
5+
"vscode": {
6+
"extensions": [
7+
"ms-vscode.cpptools",
8+
"DavidAnson.vscode-markdownlint"
9+
]
10+
}
11+
}
12+
}

0 commit comments

Comments
 (0)