suppression du sous module vcpkg

yobeonline · Jan 6, 2024 · fef4220 · fef4220
1 parent 944651c
commit fef4220
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml
@@ -8,6 +8,7 @@ jobs:
       matrix:
         config: [Release, Debug]
         os: [ubuntu-latest, windows-latest]
+        gcc: [13]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -16,18 +17,15 @@ jobs:
       - name: Get latest cmake
         uses: lukka/get-cmake@latest
 
-      - name: set compiler
-        if: matrix.os == 'ubuntu-latest'
-        run: |
-          echo "CXX=g++-10" >> $GITHUB_ENV
-          echo "CC=gcc-10" >> $GITHUB_ENV
-
-      - name: Configure Linux
-        if: matrix.os == 'ubuntu-latest'
+      - name: Configure (!Windows)
+        env:
+          CC: gcc-${{ matrix.gcc }}
+          CXX: g++-${{ matrix.gcc }}
+        if: runner.os != 'Windows'
         run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} --preset gcc-dev  -B build -S .
 
-      - name: Configure Windows
-        if: matrix.os == 'windows-latest'
+      - name: Configure (Windows)
+        if: runner.os == 'Windows'
         run: cmake -DCMAKE_BUILD_TYPE=${{ matrix.config }} --preset msvc-dev  -B build -S .
 
       - name: Build

diff --git a/.gitmodules b/.gitmodules
diff --git a/vcpkg b/vcpkg
diff --git a/vcpkg-configuration.json b/vcpkg-configuration.json
@@ -0,0 +1,8 @@
+{
+  "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg-configuration.schema.json",
+  "default-registry": {
+    "kind": "git",
+    "repository": "https://github.com/microsoft/vcpkg",
+    "baseline": "c8696863d371ab7f46e213d8f5ca923c4aef2a00"
+  }
+}