trying github actions without builtin-baseline

Remi-Coulom · Sep 19, 2024 · 53cde3d · 53cde3d
1 parent b1af70d
commit 53cde3d
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/.github/workflows/ubuntu_test_nodeps.yml b/.github/workflows/ubuntu_test_nodeps.yml
@@ -11,20 +11,24 @@ jobs:
         os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
 
     steps:
-    - uses: actions/checkout@v4
+      - name: Checkout repository
+        uses: actions/checkout@v4
 
-    - name: Configure CMake
-      working-directory: ${{github.workspace}}/compcmake
-      run: ./generate.sh
+      - name: Install gtest
+        run: sudo apt-get -y install libgtest-dev
 
-    - name: Test with gcc in asan mode
-      working-directory: ${{github.workspace}}/compcmake/gcc_asan
-      run: ctest -V
+      - name: Configure CMake
+        working-directory: ${{github.workspace}}/compcmake
+        run: ./generate.sh
 
-    - name: Test with gcc with joedb::File = joedb::Portable_File
-      working-directory: ${{github.workspace}}/compcmake/gcc_portable
-      run: ctest -V
+      - name: Test with gcc in asan mode
+        working-directory: ${{github.workspace}}/compcmake/gcc_asan
+        run: ctest -V
 
-    - name: Test with clang in release mode
-      working-directory: ${{github.workspace}}/compcmake/clang_release
-      run: ctest -V
+      - name: Test with gcc with joedb::File = joedb::Portable_File
+        working-directory: ${{github.workspace}}/compcmake/gcc_portable
+        run: ctest -V
+
+      - name: Test with clang in release mode
+        working-directory: ${{github.workspace}}/compcmake/clang_release
+        run: ctest -V
diff --git a/.github/workflows/universal_test.yml b/.github/workflows/universal_test.yml
@@ -9,12 +9,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-2022, windows-2019, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, macos-14, macos-13, macos-12]
+        #os: [windows-2022, windows-2019, ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, macos-14, macos-13, macos-12]
+        os: [windows-2022]
 
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: print vcpkg environment variables
+        shell: bash
+        run: echo VCPKG_ROOT=$VCPKG_INSTALLATION_ROOT
+
       - name: Configure CMake
         working-directory: ${{github.workspace}}/compcmake
         run: cmake -B build -DCMAKE_BUILD_TYPE=Debug

diff --git a/compcmake/vcpkg.json b/compcmake/vcpkg.json
@@ -11,6 +11,5 @@
     "asio",
     "gtest",
     "sqlite3"
-  ],
-  "builtin-baseline": "efb544d5a580c51f270998d6522c08debb1b5769"
+  ]
 }