Skip to content

Commit b916294

Browse files
committed
ci: update
1 parent f0f3d52 commit b916294

File tree

3 files changed

+12
-9
lines changed

3 files changed

+12
-9
lines changed

.github/workflows/farcolorer-ci.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ jobs:
3535
build: [ x64, x86, arm64 ]
3636
legacy: [ON, OFF]
3737
include:
38-
- { build: x64, arch: amd64 }
39-
- { build: x86, arch: amd64_x86 }
40-
- { build: arm64, arch: amd64_arm64 }
38+
- { build: x64, arch: amd64, triplet: x64-win-static-rel}
39+
- { build: x86, arch: amd64_x86, triplet: x86-win-static-rel}
40+
- { build: arm64, arch: amd64_arm64, triplet: arm64-win-static-rel}
4141

4242
runs-on: windows-2022
4343

@@ -83,6 +83,7 @@ jobs:
8383
-DCOLORER_BUILD_ARCH=${{ matrix.build }}
8484
-DFARCOLORER_LEGACY=${{ matrix.legacy }}
8585
-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
86+
-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
8687
8788
- name: Build
8889
shell: bash

.github/workflows/farcolorer-release.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ jobs:
1414
build: [ x64, x86, arm64 ]
1515
legacy: [ON, OFF]
1616
include:
17-
- { build: x64, arch: amd64 }
18-
- { build: x86, arch: amd64_x86 }
19-
- { build: arm64, arch: amd64_arm64 }
17+
- { build: x64, arch: amd64, triplet: x64-win-static-rel}
18+
- { build: x86, arch: amd64_x86, triplet: x86-win-static-rel}
19+
- { build: arm64, arch: amd64_arm64, triplet: arm64-win-static-rel}
2020

2121
env:
2222
BUILD_TYPE: Release
@@ -62,6 +62,7 @@ jobs:
6262
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
6363
-DCOLORER_BUILD_ARCH=${{ matrix.build }}
6464
-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
65+
-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
6566
-DFARCOLORER_LEGACY=${{ matrix.legacy }}
6667
-DCMAKE_INSTALL_PREFIX=./install/FarColorer
6768

.github/workflows/prebuild.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ jobs:
1919
matrix:
2020
build: [ x64, x86, arm64 ]
2121
include:
22-
- { build: x64, arch: amd64 }
23-
- { build: x86, arch: amd64_x86 }
24-
- { build: arm64, arch: amd64_arm64 }
22+
- { build: x64, arch: amd64, triplet: x64-win-static-rel}
23+
- { build: x86, arch: amd64_x86, triplet: x86-win-static-rel}
24+
- { build: arm64, arch: amd64_arm64, triplet: arm64-win-static-rel}
2525

2626
name: windows-${{ matrix.arch }}
2727

@@ -63,6 +63,7 @@ jobs:
6363
-DCMAKE_BUILD_TYPE=$BUILD_TYPE
6464
-DCOLORER_BUILD_ARCH=${{ matrix.build }}
6565
-DCMAKE_TOOLCHAIN_FILE=$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
66+
-DVCPKG_TARGET_TRIPLET=${{ matrix.triplet }}
6667
-DFARCOLORER_LEGACY=OFF
6768
6869
# dependencies are being built at the configuration stage

0 commit comments

Comments
 (0)