bold updates to ci

cisco · Aug 29, 2023 · ce7d986 · ce7d986
1 parent f27e8b7
commit ce7d986
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -34,9 +34,10 @@ jobs:
     env:
       CMAKE_BUILD_DIR: ${{ github.workspace }}/build
       CMAKE_TEST_DIR: ${{ github.workspace }}/build/test
+      VCPKG_BINARY_SOURCES: files,${{ github.workspace }}/build/cache,rw
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: dependencies (macos)
       if: ${{ matrix.os == 'macos-latest' }}
@@ -46,19 +47,18 @@ jobs:
         ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy"
 
     - name: Restore cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
-        path: |
-            ${{ env.CMAKE_BUILD_DIR }}/vcpkg_installed
-        key: ${{ runner.os }}-${{ hashFiles( '**/vcpkg.json' ) }}
+        path: ${{ github.workspace }}/build/cache
+        key: ${{ runner.os }}
 
     - name: Configure to use clang-tidy and sanitizers      
       run: |
         cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DTESTING=ON -DCLANG_TIDY=ON -DSANITIZERS=ON -DCMAKE_TOOLCHAIN_FILE="${{ matrix.vcpkg-cmake-file}}" .
 
     - name: Build
       run: |
-        cmake --build "${{ env.CMAKE_BUILD_DIR }}"
+        cmake --build "${{ env.CMAKE_BUILD_DIR }}" --parallel 2
 
     - name: Unit tests
       run: |

diff --git a/.github/workflows/build_openssl3.yml b/.github/workflows/build_openssl3.yml
@@ -37,9 +37,10 @@ jobs:
     env:
       CMAKE_BUILD_DIR: ${{ github.workspace }}/build
       CMAKE_TEST_DIR: ${{ github.workspace }}/build/test
+      VCPKG_BINARY_SOURCES: files,${{ github.workspace }}/build/cache,rw
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: dependencies (macos)
       if: ${{ matrix.os == 'macos-latest' }}
@@ -49,11 +50,10 @@ jobs:
         ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy"
 
     - name: Restore cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
-        path: |
-            ${{ env.CMAKE_BUILD_DIR }}/vcpkg_installed
-        key: ${{ runner.os }}-${{ hashFiles( '**/vcpkg.json' ) }}
+        path: ${{ github.workspace }}/build/cache
+        key: ${{ runner.os }}
 
     - name: Configure to use clang-tidy and sanitizers
       run: |

diff --git a/.github/workflows/compat.yml b/.github/workflows/compat.yml
@@ -19,9 +19,10 @@ jobs:
     env:
         CMAKE_BUILD_DIR: ${{ github.workspace }}/build
         TOOLCHAIN_FILE: $VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
+        VCPKG_BINARY_SOURCES: files,${{ github.workspace }}/build/cache,rw
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: dependencies
       run: |
@@ -30,13 +31,12 @@ jobs:
         ln -s "/usr/local/opt/llvm/bin/clang-tidy" "/usr/local/bin/clang-tidy"
 
     - name: Restore cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
-        path: |
-            ${{ env.CMAKE_BUILD_DIR }}/vcpkg_installed
-        key: ${{ runner.os }}-${{ hashFiles( '**/vcpkg.json' ) }}
+        path: ${{ github.workspace }}/build/cache
+        key: ${{ runner.os }}
 
     - name: build the library
       run: |
         cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCMAKE_TOOLCHAIN_FILE="${{ env.TOOLCHAIN_FILE }}" .
-        cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target mlspp
+        cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target mlspp --parallel 2
diff --git a/.github/workflows/interop.yml b/.github/workflows/interop.yml
@@ -18,27 +18,27 @@ jobs:
     env:
         CMAKE_BUILD_DIR: ${{ github.workspace }}/build
         TOOLCHAIN_FILE: $VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake
+        VCPKG_BINARY_SOURCES: files,${{ github.workspace }}/build/cache,rw
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Restore cache
-      uses: actions/cache@v2
+      uses: actions/cache@v3
       with:
-        path: |
-            ${{ env.CMAKE_BUILD_DIR }}/vcpkg_installed
-        key: ${{ runner.os }}-${{ hashFiles( '**/vcpkg.json' ) }}
+        path: ${{ github.workspace }}/build/cache
+        key: ${{ runner.os }}
 
     - name: Build the library      
       run: |
         cmake -B build -DCMAKE_TOOLCHAIN_FILE="${{ env.TOOLCHAIN_FILE }}" .
-        cmake --build build          
+        cmake --build build --parallel 2
 
     - name: Build interop harness
       run: |
         cd cmd/interop
         cmake -B build -DSANITIZERS=ON -DCMAKE_TOOLCHAIN_FILE="${{ env.TOOLCHAIN_FILE }}" .
-        cmake --build build
+        cmake --build build --parallel 2
 
     - name: Test self-interop
       run: |