[vcpkg] Onboard Linux to VMSS, open 'git' port, and switch back to Azure Spot #10980
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| Source: argh | ||
| Version: 2018-12-18-2 | ||
| Description: Argh! A minimalist argument handler. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| From 83f364a2eb1b137453772ae9fcf5d7973770637f Mon Sep 17 00:00:00 2001 | ||
| From: Billy Robert O'Neal III <bion@microsoft.com> | ||
| Date: Wed, 29 Apr 2020 13:01:31 -0700 | ||
| Subject: [PATCH] Don't install 'LICENSE' or 'README.md' directly to the | ||
| installation directory. | ||
|
|
||
| This change unconditionally uses GNUInstallDirs which will correctly 'namespace' these files with the 'argh' project name. | ||
|
|
||
| ========= | ||
|
|
||
| The names 'LICENSE' and 'README.md' are extremely common and likely to be taken by other ports. This happened in a recent full vcpkg catalog rebuild: | ||
|
|
||
| Starting package 757/1254: qt-advanced-docking-system:x86-windows | ||
| Building package qt-advanced-docking-system[core]:x86-windows... | ||
| Could not locate cached archive: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip | ||
| -- Downloading https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System/archive/661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz... | ||
| -- Extracting source C:/agent/_work/1/s/downloads/githubuser0xFFFF-Qt-Advanced-Docking-System-661d0c4356ab61d155b53718aa1bf6bab86dad13.tar.gz | ||
| -- Applying patch config_changes.patch | ||
| -- Using source at C:/agent/_work/1/s/buildtrees/qt-advanced-docking-system/src/bab86dad13-3088149a9b | ||
| -- Configuring x86-windows | ||
| -- Building x86-windows-dbg | ||
| -- Building x86-windows-rel | ||
| -- Installing: C:/agent/_work/1/s/packages/qt-advanced-docking-system_x86-windows/share/qt-advanced-docking-system/copyright | ||
| -- Performing post-build validation | ||
| -- Performing post-build validation done | ||
| Stored binary cache: C:\agent\_work\1\s\archives\a1\a1507296ead5788137561997571557204aaac78f.zip | ||
| Building package qt-advanced-docking-system[core]:x86-windows... done | ||
| Installing package qt-advanced-docking-system[core]:x86-windows... | ||
| The following files are already installed in C:/agent/_work/1/s/installed/x86-windows and are in conflict with qt-advanced-docking-system:x86-windows | ||
|
|
||
| Installed by argh:x86-windows | ||
| license/LICENSE | ||
|
|
||
| Elapsed time for package qt-advanced-docking-system:x86-windows: 11.09 s | ||
| --- | ||
| CMakeLists.txt | 12 +++++------- | ||
| 1 file changed, 5 insertions(+), 7 deletions(-) | ||
|
|
||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index 13bc879..f6264f3 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -36,19 +36,17 @@ endif() | ||
|
|
||
| install(TARGETS argh EXPORT arghTargets) | ||
|
|
||
| +include(GNUInstallDirs) | ||
| +install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
| +install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) | ||
| +install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) | ||
| + | ||
| if(CMAKE_SYSTEM_NAME STREQUAL Linux) | ||
| # this might be a bit too restrictive, since for other (BSD, ...) this might apply also | ||
| # but this can be fixed later in extra pull requests from people on the platform | ||
| - include(GNUInstallDirs) | ||
| - install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
| - install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION ${CMAKE_INSTALL_DOCDIR}) | ||
| - install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION ${CMAKE_INSTALL_DOCDIR}) | ||
| install(FILES argh-config.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) | ||
| install(EXPORT arghTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/argh) | ||
| else() | ||
| - install(FILES "${CMAKE_CURRENT_LIST_DIR}/argh.h" DESTINATION include) | ||
| - install(FILES "${CMAKE_CURRENT_LIST_DIR}/LICENSE" DESTINATION license) | ||
| - install(FILES "${CMAKE_CURRENT_LIST_DIR}/README.md" DESTINATION .) | ||
| install(FILES argh-config.cmake DESTINATION CMake) | ||
| install(EXPORT arghTargets DESTINATION CMake) | ||
| endif() |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,5 @@ | ||
| Source: idevicerestore | ||
| Version: 1.0.12-4 | ||
| Description: Restore/upgrade firmware of iOS devices | ||
| Build-Depends: libimobiledevice, curl, libirecovery, libzip | ||
| Supports: !(windows) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: openblas | ||
| Version: 0.3.9-1 | ||
| Homepage: https://github.com/xianyi/OpenBLAS | ||
| Build-Depends: pthread (linux) | ||
| Description: OpenBLAS is an optimized BLAS library based on GotoBLAS2 1.13 BSD version. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| From 21f6c4b5a972683f7228e5ad446bc940947c2d2b Mon Sep 17 00:00:00 2001 | ||
| From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= | ||
| =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= <chinoune.mehdi@gmail.com> | ||
| Date: Mon, 2 Mar 2020 17:22:28 +0100 | ||
| Subject: [PATCH] fixes #2480 | ||
|
|
||
| --- | ||
| cmake/cc.cmake | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/cmake/cc.cmake b/cmake/cc.cmake | ||
| index 22217575c..d5551147c 100644 | ||
| --- a/cmake/cc.cmake | ||
| +++ b/cmake/cc.cmake | ||
| @@ -99,7 +99,7 @@ endif () | ||
| if (${CORE} STREQUAL "SKYLAKEX") | ||
| if (NOT DYNAMIC_ARCH) | ||
| if (NOT NO_AVX512) | ||
| - set (CCOMMON_OPT = "${CCOMMON_OPT} -march=skylake-avx512") | ||
| + set (CCOMMON_OPT "${CCOMMON_OPT} -march=skylake-avx512") | ||
| endif () | ||
| endif () | ||
| endif () |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| Source: qt-advanced-docking-system | ||
| Version: 3.2.5-1 | ||
| Build-Depends: qt5-base, zlib, bzip2 | ||
| Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio | ||
| Homepage: https://github.com/githubuser0xFFFF/Qt-Advanced-Docking-System |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index a2cb47d..57a1cf5 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -81,14 +81,8 @@ install(FILES ${ads_INSTALL_INCLUDE} | ||
| DESTINATION include | ||
| COMPONENT headers | ||
| ) | ||
| -install(FILES | ||
| - "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE" | ||
| - "${CMAKE_CURRENT_SOURCE_DIR}/gnu-lgpl-v2.1.md" | ||
| - DESTINATION license | ||
| - COMPONENT license | ||
| -) | ||
| install(TARGETS qtadvanceddocking | ||
| EXPORT qt-advanced-docking-systemConfig | ||
| RUNTIME DESTINATION bin | ||
| LIBRARY DESTINATION lib | ||
| ARCHIVE DESTINATION lib |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| # Copyright (c) Microsoft Corporation. | ||
| # SPDX-License-Identifier: MIT | ||
| # | ||
|
|
||
| jobs: | ||
| - job: x64_linux | ||
| pool: | ||
| name: ${{ parameters.poolName }} | ||
|
|
||
| timeoutInMinutes: 1440 # 1 day | ||
|
|
||
| steps: | ||
| - task: Bash@3 | ||
| displayName: 'Initialize Environment' | ||
| inputs: | ||
| filePath: scripts/azure-pipelines/linux/initialize-environment.sh | ||
| - task: Bash@3 | ||
| displayName: 'Build vcpkg' | ||
| inputs: | ||
| filePath: bootstrap-vcpkg.sh | ||
| - powershell: | | ||
| $skipList = ./scripts/azure-pipelines/generate-skip-list.ps1 -Triplet "x64-linux" -BaselineFile "$(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt" | ||
| mkdir $(System.ArtifactsDirectory)/xml-results | ||
| mkdir /ci/home | ||
| $env:HOME = '/ci/home' | ||
| ./vcpkg ci x64-linux --x-xunit="$(System.ArtifactsDirectory)/xml-results/x64-linux.xml" --exclude=$skipList --binarycaching | ||
| displayName: '** Test Modified Ports **' | ||
| - task: PowerShell@2 | ||
| displayName: 'Analyze results and prepare test logs' | ||
| inputs: | ||
| failOnStderr: true | ||
| filePath: 'scripts/azure-pipelines/analyze-test-results.ps1' | ||
| arguments: '-baselineFile $(System.DefaultWorkingDirectory)/scripts/ci.baseline.txt -logDir "$(System.ArtifactsDirectory)/xml-results" -outputDir "$(Build.ArtifactStagingDirectory)" -failurelogDir "archives/fail" -triplets "x64-linux" -errorOnRegression' | ||
| - task: PublishBuildArtifacts@1 | ||
| displayName: 'Publish Artifact: x86-linux Build Failure Logs' | ||
| inputs: | ||
| PathtoPublish: '$(Build.ArtifactStagingDirectory)/failureLogs' | ||
| ArtifactName: 'x64-linux port build failure logs' | ||
| condition: failed() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.