Pipelines cleanup, use custom triplets from vcpkg fork

TechSmith · Aug 1, 2023 · 6f98d12 · 6f98d12
1 parent 347c540
commit 6f98d12
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 26 deletions.
diff --git 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
diff --git a/triplets/x64-osx-dynamic-release.cmake b/triplets/x64-osx-dynamic-release.cmake
diff --git a/triplets/x64-windows-dynamic-release.cmake b/triplets/x64-windows-dynamic-release.cmake