githubactions: Fix macos arch. Add cmake tool chain on windows

Yubico · Nov 30, 2023 · 2fb5fe6 · 2fb5fe6
1 parent ca11005
commit 2fb5fe6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/macos_release.yml b/.github/workflows/macos_release.yml
@@ -68,7 +68,7 @@ jobs:
           export INSTALL_PREFIX=/usr/local
 
           cd yubico-piv-tool-$RELEASE_VERSION
-          ./resources/macos/make_release_binaries.sh $RELEASE_VERSION $SO_VERSION $INSTALL_PREFIX
+          ./resources/macos/make_release_binaries.sh ${{ matrix.arch }} $RELEASE_VERSION $SO_VERSION $INSTALL_PREFIX
           mkdir $GITHUB_WORKSPACE/artifact
           mv resources/macos/yubico-piv-tool-$RELEASE_VERSION-mac.zip $GITHUB_WORKSPACE/artifact/
 

diff --git a/.github/workflows/windows_build.yml b/.github/workflows/windows_build.yml
@@ -81,7 +81,7 @@ jobs:
 
           cd yubico-piv-tool-
           mkdir build; cd build
-          cmake -A $env:ARCH_CMAKE -DVERBOSE_CMAKE=ON -DGETOPT_LIB_DIR=C:/vcpkg/packages/getopt-$env:ARCH_CMAKE_$env:ARCH-windows/lib -DGETOPT_INCLUDE_DIR=C:/vcpkg/packages/getopt-$env:ARCH_CMAKE_$env:ARCH-windows/include -DCHECK_PATH=C:/vcpkg/packages/check_$env:ARCH-windows ..
+          cmake -A $env:ARCH_CMAKE -DVERBOSE_CMAKE=ON -DCMAKE_TOOLCHAIN_FILE=C:\vcpkg\scripts\buildsystems\vcpkg.cmake  -DGETOPT_LIB_DIR=C:/vcpkg/packages/getopt-$env:ARCH_CMAKE_$env:ARCH-windows/lib -DGETOPT_INCLUDE_DIR=C:/vcpkg/packages/getopt-$env:ARCH_CMAKE_$env:ARCH-windows/include -DCHECK_PATH=C:/vcpkg/packages/check_$env:ARCH-windows ..
           cmake --build . -v
           $env:Path +=";C:/vcpkg/packages/check_$env:ARCH-windows/bin;C:/vcpkg/packages/openssl_$env:ARCH-windows/bin;$env:GITHUB_WORKSPACE\yubico-piv-tool-\build\lib\Debug;$env:GITHUB_WORKSPACE\yubico-piv-tool-\build\ykcs11\Debug"
           ctest.exe -C Debug