svn commit: r1920785 - /subversion/trunk/.github/workflows/cmake.yml

Author: rinrab
Date: Thu Sep 19 14:19:40 2024
New Revision: 1920785

URL: http://svn.apache.org/viewvc?rev=1920785&view=rev
Log:
GitHub Actions: Using variable for VCPKG_TARGET_TRIPLET instead of variable.

Note: this variable will do nothing when compiling for Linux.

* .github/workflows/cmake.yml
  (win deps): Do not export VCPKG_TARGET_TRIPLET environment variable.
  (cmake): Specify VCPKG_TARGET_TRIPLET var when configuring cmake to
   vcpkg_triplet value of the matrix.

Modified:
    subversion/trunk/.github/workflows/cmake.yml

Modified: subversion/trunk/.github/workflows/cmake.yml
URL: http://svn.apache.org/viewvc/subversion/trunk/.github/workflows/cmake.yml?rev=1920785&r1=1920784&r2=1920785&view=diff
==============================================================================
--- subversion/trunk/.github/workflows/cmake.yml (original)
+++ subversion/trunk/.github/workflows/cmake.yml Thu Sep 19 14:19:40 2024
@@ -76,7 +76,6 @@ jobs:
             apr apr-util expat zlib sqlite3
 
           "CMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake" >> $env:GITHUB_ENV
-          "VCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}" >> $env:GITHUB_ENV
 
       - name: Install dependecies (Linux, apt-get)
         if: runner.os == 'Linux'
@@ -107,6 +106,7 @@ jobs:
           -DBUILD_SHARED_LIBS=${{ matrix.build_shared }}
           -DSVN_ENABLE_TESTS=ON
           -DCMAKE_INSTALL_PREFIX=${{ github.workspace }}/installdir
+          -DVCPKG_TARGET_TRIPLET=${{ matrix.vcpkg_triplet }}
 
       - name: Build CMake
         run: cmake --build out