Update ci.yml

compiler-research · Jan 22, 2024 · 02aea44 · 02aea44
1 parent 673fdd3
commit 02aea44
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -395,7 +395,7 @@ jobs:
       id: cache
       with:
         path: |
-          llvm-project
+          ../llvm-project
           ${{ matrix.cling=='On' && 'cling' || '' }}
         key: ${{ env.CLING_HASH }}-${{ runner.os }}-${{ matrix.os }}-${{ matrix.compiler }}-clang-${{ matrix.clang-runtime }}.x-patch-${{ hashFiles(format('patches/llvm/clang{0}-*.patch', matrix.clang-runtime)) || 'none' }}
 
@@ -531,13 +531,14 @@ jobs:
       if: ${{ steps.cache.outputs.cache-hit != 'true' }}
       with:
         path: |
-          llvm-project
+          ../llvm-project
           ${{ matrix.cling=='On' && 'cling' || '' }}
         key: ${{ steps.cache.outputs.cache-primary-key }}
 
     - name: Build and Test/Install CppInterOp on Unix systems
       if: ${{ runner.os != 'windows' }}
       run: |
+        cd ..
         git clone --depth=1 https://github.com/compiler-research/CppInterOp.git
         LLVM_DIR="$(pwd)/llvm-project"
         LLVM_BUILD_DIR="$(pwd)/llvm-project/build"
@@ -597,6 +598,7 @@ jobs:
     - name: Build and Test/Install CppInterOp on Windows systems
       if: ${{ runner.os == 'windows' }}
       run: |
+        cd ..
         git clone --depth=1 https://github.com/compiler-research/CppInterOp.git
         $env:PWD_DIR= $PWD.Path
         
@@ -666,7 +668,6 @@ jobs:
     - name: Build and Install cppyy-backend on Unix Systems
       if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
       run: |
-        cd cppyy-backend
         mkdir -p $CPPINTEROP_DIR/lib build && cd build
         # Install CppInterOp
         (cd $CPPINTEROP_BUILD_DIR && cmake --build . --target install --parallel $(nproc --all))
@@ -684,6 +685,7 @@ jobs:
     - name: Install CPyCppyy on Unix Systems
       if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
       run: |
+        cd ..
         # Setup virtual environment
         python3 -m venv .venv
         source .venv/bin/activate
@@ -701,6 +703,7 @@ jobs:
     - name: Install cppyy on Unix Systems
       if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
       run: |
+        cd ..
         # source virtual environment
         source .venv/bin/activate
         # Install cppyy
@@ -711,6 +714,7 @@ jobs:
     - name: Run cppyy on Unix Systems
       if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
       run: |
+        cd ..
         # Run cppyy
         source .venv/bin/activate
         export PYTHONPATH=$PYTHONPATH:$CPYCPPYY_DIR:$CB_PYTHON_DIR
@@ -721,6 +725,7 @@ jobs:
       continue-on-error: true
       if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') }}
       run: |
+        cd ..
         # Run the tests
         source .venv/bin/activate
         cd cppyy/test