From 6f98d124d23dea96a9a502c3d7c96f537ac06f8c Mon Sep 17 00:00:00 2001 From: Mike Malburg Date: Thu, 27 Jul 2023 17:03:27 -0400 Subject: [PATCH 1/3] Pipelines cleanup, use custom triplets from vcpkg fork --- azure-pipelines.yml | 18 ++++++++++++------ triplets/arm64-osx-dynamic-release.cmake | 8 -------- triplets/x64-osx-dynamic-release.cmake | 8 -------- triplets/x64-windows-dynamic-release.cmake | 4 ---- 4 files changed, 12 insertions(+), 26 deletions(-) delete mode 100644 triplets/arm64-osx-dynamic-release.cmake delete mode 100644 triplets/x64-osx-dynamic-release.cmake delete mode 100644 triplets/x64-windows-dynamic-release.cmake diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1ca7416..1aec7e7 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -11,12 +11,16 @@ jobs: cd vcpkg ./bootstrap-vcpkg.sh displayName: Setup vcpkg - + - bash: | - ./vcpkg install pango:x64-osx-dynamic-release --overlay-triplets=$(Build.SourcesDirectory)/triplets - ./vcpkg install pango:arm64-osx-dynamic-release --overlay-triplets=$(Build.SourcesDirectory)/triplets + ./vcpkg install pango:x64-osx-dynamic-release workingDirectory: vcpkg - displayName: Run vcpkg install + displayName: Run vcpkg install (x64-osx-dynamic-release) + + - bash: | + ./vcpkg install pango:arm64-osx-dynamic-release + workingDirectory: vcpkg + displayName: Run vcpkg install (arm64-osx-dynamic-release) - bash: | ./vcpkg list > ../versions.txt @@ -63,6 +67,7 @@ jobs: ########################### - job: CreateWinPangoLibsViaVcpkg + #condition: eq(true, false) # disable job for now pool: vmImage: 'windows-2022' steps: @@ -73,8 +78,8 @@ jobs: displayName: Setup vcpkg - bash: | - ./vcpkg.exe install pango:x64-windows-release --overlay-triplets=$(Build.SourcesDirectory)/triplets - workingDirectory: vcpkg + ./vcpkg/vcpkg.exe install pango:x64-windows-release + workingDirectory: $(Build.SourcesDirectory) displayName: Run vcpkg install - bash: | @@ -114,3 +119,4 @@ jobs: inputs: pathToPublish: $(Build.ArtifactStagingDirectory)/WinPango.tar.gz artifactName: WinPango + diff --git a/triplets/arm64-osx-dynamic-release.cmake b/triplets/arm64-osx-dynamic-release.cmake deleted file mode 100644 index 4969e08..0000000 --- a/triplets/arm64-osx-dynamic-release.cmake +++ /dev/null @@ -1,8 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE arm64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES arm64) - -set(VCPKG_BUILD_TYPE release) diff --git a/triplets/x64-osx-dynamic-release.cmake b/triplets/x64-osx-dynamic-release.cmake deleted file mode 100644 index ef61b62..0000000 --- a/triplets/x64-osx-dynamic-release.cmake +++ /dev/null @@ -1,8 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) - -set(VCPKG_CMAKE_SYSTEM_NAME Darwin) -set(VCPKG_OSX_ARCHITECTURES x86_64) -set(VCPKG_BUILD_TYPE release) - diff --git a/triplets/x64-windows-dynamic-release.cmake b/triplets/x64-windows-dynamic-release.cmake deleted file mode 100644 index f6c4025..0000000 --- a/triplets/x64-windows-dynamic-release.cmake +++ /dev/null @@ -1,4 +0,0 @@ -set(VCPKG_TARGET_ARCHITECTURE x64) -set(VCPKG_CRT_LINKAGE dynamic) -set(VCPKG_LIBRARY_LINKAGE dynamic) -set(VCPKG_BUILD_TYPE release) From 5a4f69499dffdd4d587193668d58805b38b97b12 Mon Sep 17 00:00:00 2001 From: David Cheng Date: Tue, 1 Aug 2023 16:27:12 -0400 Subject: [PATCH 2/3] Build windows-dynamic-release --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 1aec7e7..7feed0a 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -78,7 +78,7 @@ jobs: displayName: Setup vcpkg - bash: | - ./vcpkg/vcpkg.exe install pango:x64-windows-release + ./vcpkg/vcpkg.exe install pango:x64-windows-dynamic-release workingDirectory: $(Build.SourcesDirectory) displayName: Run vcpkg install From 15b10d8afe3384a3e6e55fb0c5167db85d662077 Mon Sep 17 00:00:00 2001 From: David Cheng Date: Tue, 1 Aug 2023 17:06:58 -0400 Subject: [PATCH 3/3] Fix path to windows-dynamic-release --- azure-pipelines.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7feed0a..2eb0fdb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -89,8 +89,8 @@ jobs: displayName: Save library versions to a text and json file - bash: | - ls -l vcpkg/installed/x64-windows-release/include - ls -l vcpkg/installed/x64-windows-release/lib + ls -l vcpkg/installed/x64-windows-dynamic-release/include + ls -l vcpkg/installed/x64-windows-dynamic-release/lib displayName: DEBUGGING - bash: | @@ -98,17 +98,17 @@ jobs: rm -rf tools rm -rf share rm -rf debug # shouldn't need this - workingDirectory: vcpkg/installed/x64-windows-release + workingDirectory: vcpkg/installed/x64-windows-dynamic-release displayName: Remove stuff we don't want - bash: | - cp versions.txt vcpkg/installed/x64-windows-release - cp versions.json vcpkg/installed/x64-windows-release + cp versions.txt vcpkg/installed/x64-windows-dynamic-release + cp versions.json vcpkg/installed/x64-windows-dynamic-release displayName: Copy versions.txt/json to archive stage - task: ArchiveFiles@2 inputs: - rootFolderOrFile: vcpkg/installed/x64-windows-release + rootFolderOrFile: vcpkg/installed/x64-windows-dynamic-release archiveType: 'tar' archiveFile: '$(Build.ArtifactStagingDirectory)/WinPango.tar.gz' verbose: true # boolean. Force verbose output. Default: false.