github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Ubuntu 20 -> Ubuntu 22 migration (#6498)

Browse Source 
* Remove g++-8, not present in Ubuntu 22

* Update clang-11 job to Ubuntu 22

* Move live testing matrix to Ubuntu 22

* image.yml: Linux Next -> Linux

* "release" differentiator

* LINUXNEXT -> LINUX

* Deduplicate Ubuntu 22 in live matrix

* Trivial change to trigger CI

* Revert "Trivial change to trigger CI"

This reverts commit 72dae1d0cd90435cdad18391a993154a2b32c9e3.
This commit is contained in:
Daniel Jurek 2025-04-08 10:08:05 -07:00 committed by GitHub
parent 9b94fc3f72
commit c49375b9d4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 17 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eng/pipelines/templates/jobs/ci.tests.yml
View File

@ -143,8 +143,8 @@ jobs:
- bash: |
# Run clang-format recursively on each source and header file within the repo sdk folder.
echo "Check clang-formatting"
clang-format --version
find ./sdk \( -iname '*.hpp' -o -iname '*.cpp' \) ! -iname 'json.hpp' -exec clang-format -i {} \;
clang-format-11 --version
find ./sdk \( -iname '*.hpp' -o -iname '*.cpp' \) ! -iname 'json.hpp' -exec clang-format-11 -i {} \;
if [[ `git status | grep modified | awk '{print $2}'` ]]; then
echo Some files were not formatted correctly according to the .clang-format file.

4
eng/pipelines/templates/stages/platform-matrix-cmakegenerate.json
View File

@ -3,8 +3,8 @@
"CmakeEnvArg": "",
"OSConfig": {
"Linux": {
"Pool": "env:LINUXNEXTPOOL",
"OSVmImage": "env:LINUXNEXTVMIMAGE",
"Pool": "env:LINUXPOOL",
"OSVmImage": "env:LINUXVMIMAGE",
"AptDependencies": "libcurl4-openssl-dev",
"VCPKG_DEFAULT_TRIPLET": "x64-linux"
},

4
eng/pipelines/templates/stages/platform-matrix-cmakesourcegenerate.json
View File

@ -7,8 +7,8 @@
"CmakeEnvArg": ""
},
"Linux": {
"Pool": "env:LINUXNEXTPOOL",
"OSVmImage": "env:LINUXNEXTVMIMAGE",
"Pool": "env:LINUXPOOL",
"OSVmImage": "env:LINUXVMIMAGE",
"CmakeEnvArg": "",
"AptDependencies": "libcurl4-openssl-dev"
},

21
eng/pipelines/templates/stages/platform-matrix-live.json
View File

@ -24,8 +24,8 @@
"Ubu2204": {
"VCPKG_DEFAULT_TRIPLET": "x64-linux",
"BuildArgs": "-j 4",
"Pool": "env:LINUXNEXTPOOL",
"OSVmImage": "env:LINUXNEXTVMIMAGE",
"Pool": "env:LINUXPOOL",
"OSVmImage": "env:LINUXVMIMAGE",
"RunProxyTests": true
}
},
@ -36,21 +36,8 @@
"CODE_COVERAGE": "enabled",
"CODE_COVERAGE_COLLECT_ONLY": 1,
"AZURE_CORE_ENABLE_JSON_TESTS": 1
}
}
},
{
"StaticConfigs": {
"Ubu20": {
"BuildArgs": "-j 4",
"Pool": "env:LINUXPOOL",
"OSVmImage": "env:LINUXVMIMAGE",
"VCPKG_DEFAULT_TRIPLET": "x64-linux",
"RunProxyTests": true
}
},
"BuildConfig": {
"x64_with_unit_test": {
},
"x64_with_unit_test_release": {
"CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON -DCMAKE_BUILD_TYPE=Release -DBUILD_SAMPLES=ON",
"AZURE_CORE_ENABLE_JSON_TESTS": 1
},

4
eng/pipelines/templates/stages/platform-matrix-quick.json
View File

@ -6,8 +6,8 @@
{
"StaticConfigs": {
"Ubuntu22": {
"OSVmImage": "env:LINUXNEXTVMIMAGE",
"Pool": "env:LINUXNEXTPOOL",
"OSVmImage": "env:LINUXVMIMAGE",
"Pool": "env:LINUXPOOL",
"VCPKG_DEFAULT_TRIPLET": "x64-linux",
"BuildArgs": "-j 10",
"RunProxyTests": true

27
eng/pipelines/templates/stages/platform-matrix.json
View File

@ -141,8 +141,8 @@
{
"StaticConfigs": {
"Ubuntu22": {
"OSVmImage": "env:LINUXNEXTVMIMAGE",
"Pool": "env:LINUXNEXTPOOL",
"OSVmImage": "env:LINUXVMIMAGE",
"Pool": "env:LINUXPOOL",
"VCPKG_DEFAULT_TRIPLET": "x64-linux",
"BuildArgs": "-j 10",
"RunProxyTests": true
@ -189,25 +189,7 @@
},
{
"StaticConfigs": {
"Ubuntu20": {
"OSVmImage": "env:LINUXVMIMAGE",
"Pool": "env:LINUXPOOL",
"VCPKG_DEFAULT_TRIPLET": "x64-linux",
"BuildArgs": "-j 10",
"RunProxyTests": true
}
},
"BuildSettings": {
"gpp-8": {
"AptDependencies": "g++-8",
"CC": "/usr/bin/gcc-8",
"CXX": "/usr/bin/g++-8"
}
}
},
{
"StaticConfigs": {
"Ubuntu20": {
"Ubuntu22": {
"OSVmImage": "env:LINUXVMIMAGE",
"Pool": "env:LINUXPOOL",
"VCPKG_DEFAULT_TRIPLET": "x64-linux",
@ -216,7 +198,8 @@
"CXX": "/usr/bin/clang++-11",
"CmakeArgs": " -DBUILD_TESTING=ON -DBUILD_PERFORMANCE_TESTS=ON -DRUN_LONG_UNIT_TESTS=ON",
"PublishMapFiles": "true",
"RunProxyTests": true
"RunProxyTests": true,
"AptDependencies": "clang-11 clang-format-11"
}
},
"BuildSettings": {

4
eng/pipelines/templates/variables/image.yml
View File

@ -2,8 +2,6 @@
variables:
- name: LINUXPOOL
value: azsdk-pool-mms-ubuntu-2004-general
- name: LINUXNEXTPOOL
value: azsdk-pool-mms-ubuntu-2204-general
- name: WINDOWSPOOL
value: azsdk-pool-mms-win-2022-general
@ -13,8 +11,6 @@ variables:
value: Azure Pipelines
- name: LINUXVMIMAGE
value: azsdk-pool-mms-ubuntu-2004-1espt
- name: LINUXNEXTVMIMAGE
value: azsdk-pool-mms-ubuntu-2204-1espt
- name: WINDOWSVMIMAGE
value: azsdk-pool-mms-win-2022-1espt