Merge branch 'sjrdc-master'

.github/workflows/ci-macos.yml

@@ -21,7 +21,7 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - uses: maxim-lobanov/setup-xcode@v1
       with:

.github/workflows/ci.yml

@@ -4,7 +4,6 @@ on: [push, pull_request]
 jobs:
   test_cereal_linux:
     runs-on: ubuntu-latest
-    container: ${{ matrix.CONTAINER }}
     strategy:
       fail-fast: false
       matrix:
@@ -164,16 +163,14 @@ jobs:
     name: ${{ matrix.name }}
 
     steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
+    - name: Check out the repo
+      uses: actions/checkout@v4
     - name: install deps and test
+      uses: addnab/docker-run-action@v3
+      with:
+        image: ${{ matrix.CONTAINER }}
+        options: -v ${{ github.workspace }}:/var/workspace 
         shell: bash
-      env:
-        CMAKE_OPTIONS: ${{ matrix.CMAKE_OPTIONS }}
-        COMPILER: ${{ matrix.COMPILER }}
-        EXTRA_APT_PACKAGES: ${{ matrix.EXTRA_APT_PACKAGES }}
-        LLVM_APT_SOURCE: ${{ matrix.LLVM_APT_SOURCE }}
         run: |
           set -ex
           apt-get update -y
@@ -186,19 +183,21 @@ jobs:
             add-apt-repository ppa:mhier/libboost-latest -y
           fi
 
-        if [[ "${LLVM_APT_SOURCE}" != "" ]]; then
+          if [[ "${{ matrix.LLVM_APT_SOURCE }}" != "" ]]; then
             wget -qO - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -
-          add-apt-repository "${LLVM_APT_SOURCE}"
+            add-apt-repository "${{ matrix.LLVM_APT_SOURCE }}"
           fi
 
           apt-get update -y
 
           # Install apt packages
-        apt-get install libboost-serialization-dev libboost-dev ${EXTRA_APT_PACKAGES} -y
+          apt-get install libboost-serialization-dev libboost-dev ${{ matrix.EXTRA_APT_PACKAGES }} -y
+          pip3 install --upgrade "pip < 21.0"
           pip3 install cmake
 
           # Set compiler and env variables
-        export CXX=${COMPILER}
+          cd /var/workspace
+          export CXX=${{ matrix.COMPILER }}
           ${CXX} --version
           DEPS_DIR="${PWD}/deps"
           mkdir -p "${DEPS_DIR}"
@@ -234,5 +233,5 @@ jobs:
           # Build cereal and test
           cmake --version
           mkdir build && cd build
-        cmake ${CMAKE_OPTIONS} .. && make -j4 VERBOSE=1
+          cmake ${{ matrix.CMAKE_OPTIONS }} .. && make -j4 VERBOSE=1
           ctest . --output-on-failure