From 955d07551e3a9cf47b8c5617959b936f9acfe73e Mon Sep 17 00:00:00 2001
From: Tuomas Koskela <t.koskela@ucl.ac.uk>
Date: Mon, 16 Dec 2024 15:04:24 +0000
Subject: [PATCH] Fix broken tar path

---
 .github/workflows/ci.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aef45661..127d39ab 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -131,13 +131,19 @@ jobs:
 
     - name: Pack dependencies
       run: |
-        tar cfv dependencies.tar ${{github.workspace}}/local
+        cd ${{github.workspace}}
+        tar cfv dependencies.tar ./local
+        # Work around a bug with paths when running in containers
+        # https://github.com/actions/runner/issues/2058
+        # use rsync because cp is being silly with identical files
+        rsync dependencies.tar $GITHUB_WORKSPACE
 
     - uses: actions/upload-artifact@v4
       with:
         name: dependencies-${{ matrix.os }}-${{ matrix.distribution }}-${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
         path: ${{github.workspace}}/dependencies.tar
         retention-days: 5
+        if-no-files-found: error
 
   test:
     needs:
@@ -167,6 +173,7 @@ jobs:
         name: dependencies-${{ matrix.os }}-${{matrix.distribution}}-${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
 
     - name: Unpack dependencies
+      working-directory: ${{github.workspace}}
       run: tar xfv dependencies.tar
 
     - name: Install Dependencies on Ubunutu
@@ -192,9 +199,10 @@ jobs:
     - name: Build tests
       # Build your program with the given configuration
       run: |
+        export CMAKE_PREFIX_PATH=${{github.workspace}}/local:$CMAKE_PREFIX_PATH
         mkdir -p ${{github.workspace}}/build
         cd ${{github.workspace}}/build
-        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Donnxrt=ON -Ddocasa=OFF -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}} -Dtests=ON --debug-find -DCMAKE_PREFIX_PATH=../local/share/cmake/sopt
+        cmake .. --fresh -DCMAKE_INSTALL_PREFIX=${{github.workspace}}/local -Donnxrt=ON -Ddocasa=OFF -Ddompi=${{matrix.mpi}} -Dopenmp=${{matrix.omp}} -Dtests=ON
         make -j$(nproc --ignore 1) install
 
     - name: Test
@@ -225,6 +233,7 @@ jobs:
         name: dependencies-${{ matrix.os }}--${{ matrix.cxx }}-${{ matrix.mpi }}-${{ matrix.omp }}
 
     - name: Unpack dependencies
+      working-directory: ${{github.workspace}}
       run: tar xfv dependencies.tar
 
     - name: Install Dependencies on Ubunutu