ci: update

colorer · Jan 24, 2025 · b916294 · b916294
1 parent f0f3d52
commit b916294
Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/.github/workflows/farcolorer-ci.yml b/.github/workflows/farcolorer-ci.yml
@@ -35,9 +35,9 @@ jobs:
         build: [ x64, x86, arm64 ]
         legacy: [ON, OFF]
         include:
-          - { build: x64,   arch: amd64 }
-          - { build: x86,   arch: amd64_x86 }
-          - { build: arm64, arch: amd64_arm64 }
+          - { build: x64,    arch: amd64,       triplet: x64-win-static-rel}
+          - { build: x86,    arch: amd64_x86,   triplet: x86-win-static-rel}
+          - { build: arm64,  arch: amd64_arm64, triplet: arm64-win-static-rel}
 
     runs-on: windows-2022
 
@@ -83,6 +83,7 @@ jobs:
           -DCOLORER_BUILD_ARCH=${{ matrix.build }}
           -DFARCOLORER_LEGACY=${{ matrix.legacy }}
           -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
 
       - name: Build
         shell: bash

diff --git a/.github/workflows/farcolorer-release.yml b/.github/workflows/farcolorer-release.yml
@@ -14,9 +14,9 @@ jobs:
         build: [ x64, x86, arm64 ]
         legacy: [ON, OFF]
         include:
-          - { build: x64,    arch: amd64 }
-          - { build: x86,    arch: amd64_x86 }
-          - { build: arm64,  arch: amd64_arm64 }
+          - { build: x64,    arch: amd64,       triplet: x64-win-static-rel}
+          - { build: x86,    arch: amd64_x86,   triplet: x86-win-static-rel}
+          - { build: arm64,  arch: amd64_arm64, triplet: arm64-win-static-rel}
 
     env:
       BUILD_TYPE: Release
@@ -62,6 +62,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE
           -DCOLORER_BUILD_ARCH=${{ matrix.build }}
           -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
           -DFARCOLORER_LEGACY=${{ matrix.legacy }}
           -DCMAKE_INSTALL_PREFIX=./install/FarColorer
 

diff --git a/.github/workflows/prebuild.yml b/.github/workflows/prebuild.yml
@@ -19,9 +19,9 @@ jobs:
       matrix:
         build: [ x64, x86, arm64 ]
         include:
-          - { build: x64,    arch: amd64 }
-          - { build: x86,    arch: amd64_x86 }
-          - { build: arm64,  arch: amd64_arm64 }
+          - { build: x64,    arch: amd64,       triplet: x64-win-static-rel}
+          - { build: x86,    arch: amd64_x86,   triplet: x86-win-static-rel}
+          - { build: arm64,  arch: amd64_arm64, triplet: arm64-win-static-rel}
 
     name: windows-${{ matrix.arch }}
 
@@ -63,6 +63,7 @@ jobs:
           -DCMAKE_BUILD_TYPE=$BUILD_TYPE
           -DCOLORER_BUILD_ARCH=${{ matrix.build }}
           -DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
           -DFARCOLORER_LEGACY=OFF
 
 # dependencies are being built at the configuration stage