win32: bump action scripts

quesnel · Jul 2, 2024 · 3a00378 · 3a00378
1 parent 55a18e1
commit 3a00378
Showing 1 changed file with 18 additions and 23 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -11,30 +11,25 @@ jobs:
     runs-on: windows-latest
     strategy:
       matrix:
-	BUILD_TYPE: [Debug, Release]
+        BUILD_TYPE: [Debug, Release]
 
     steps:
-      - name: Checkout repository and submodules
-	uses: actions/checkout@v4
-	with:
-	  submodules: recursive
+    - name: Install cmake
+      uses: lukka/get-cmake@latest
 
-      - name: Install cmake
-        uses: lukka/get-cmake@latest
+    - name: Prepare vcpkg
+      uses: lukka/run-vcpkg@v11
+      with:
+        vcpkgGitCommitId: 'f7423ee180c4b7f40d43402c2feb3859161ef625'
+        vcpkgTriplet: x64-windows
+        vcpkgJsonGlob: '**/vcpkg.json'
 
-      - name: Prepare vcpkg
-        uses: lukka/run-vcpkg@v11
-        id: runvcpkg
-        with:
-          vcpkgDirectory: '${{ github.workspace }}/vcpkg'
-          vcpkgJsonGlob: 'vcpkg.json'
-
-      - name: Run CMake consuming CMakePreset.json and run vcpkg to build packages
-        uses: lukka/run-cmake@v10
-        with:
-          configurePreset: 'ninja-multi-vcpkg'
-          configurePresetAdditionalArgs: "['-DCMAKE_CXX_STANDARD=17']"
-          buildPreset: 'ninja-multi-vcpkg'
-          buildPresetAdditionalArgs: "['--config Release']"
-          testPreset: 'ninja-multi-vcpkg'
-          testPresetAdditionalArgs: "['--config Release']"
+    - name: Run CMake
+      uses: lukka/run-cmake@v10
+      with:
+        configurePreset: 'ninja-multi-vcpkg'
+        buildPreset: 'ninja-multi-vcpkg'
+        buildPresetAdditionalArgs: "['--config ${{ matrix.BUILD_TYPE }}' ]"
+        testPreset: 'ninja-multi-vcpkg'
+        testPresetAdditionalArgs: "['--config ${{ matrix.BUILD_TYPE }}' ]"
+        configurePresetAdditionalArgs: "['-DCMAKE_CXX_STANDARD=17']"