update workflows

rekola · Feb 6, 2024 · 88c745d · 88c745d
1 parent 62dabe1
commit 88c745d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/.github/workflows/ubuntu-ci.yml b/.github/workflows/ubuntu-ci.yml
@@ -26,15 +26,20 @@ jobs:
       - uses: actions/checkout@v3
 
       # Compile
-      - name: Compilation
+      - name: Configure
+        run: |
+          sudo apt install catch2
+
+      # Build
+      - name: Build
         run: |
           mkdir build
           cd build
           cmake ..
           make
 
       # Test
-      - name: Testing
+      - name: Test
         run: |
           cd build
           ./tests
diff --git a/.github/workflows/vs17-ci.yml b/.github/workflows/vs17-ci.yml
@@ -24,10 +24,9 @@ jobs:
         run: |
           git clone https://github.com/Microsoft/vcpkg.git
           cd vcpkg
-          ./bootstrap-vcpkg.sh
-          ./vcpkg integrate install
-          ./vcpkg install catch2
-          cd ..
+          ./vcpkg/bootstrap-vcpkg.sh
+          vcpkg integrate install
+          vcpkg install catch2
           mkdir build
           cd build && cmake -G "${{matrix.gen}}" -A ${{matrix.arch}}  ..
       - name: Build