From 8537d3dbc71878a3ea6e176b0d25af8d0d51e799 Mon Sep 17 00:00:00 2001 From: alandefreitas Date: Wed, 4 Sep 2024 15:11:47 -0300 Subject: [PATCH] ci: resolve llvm-root for cache@v4 --- .github/workflows/ci.yml | 30 ++++++++++++++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d0a7dd92a..189c513db 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -224,11 +224,24 @@ jobs: run-tests: false trace-commands: true + - name: Resolve LLVM Root + id: resolve-llvm-root + run: | + set -x + cd .. + llvm_root=$(pwd)/third-party/llvm-project/install + if [[ ${{ runner.os }} == 'Windows' ]]; then + llvm_root=$(echo "$llvm_root" | sed 's/\\/\//g') + llvm_root=$(echo $llvm_root | sed 's|^/d/|D:/|') + echo "$llvm_root" + fi + echo -E "llvm-root=$llvm_root" >> $GITHUB_OUTPUT + - name: Cached LLVM Binaries id: llvm-cache uses: actions/cache@v4 with: - path: ${{ github.workspace }}/${{ matrix.llvm-root }} + path: ${{ steps.resolve-llvm-root.outputs.llvm-root }} key: ${{ matrix.llvm-cache-key }} - name: Download LLVM Binaries @@ -657,12 +670,25 @@ jobs: fi echo "exists=$exists" >> $GITHUB_OUTPUT + - name: Resolve LLVM Root + id: resolve-llvm-root + run: | + set -x + cd .. + llvm_root=$(pwd)/third-party/llvm-project/install + if [[ ${{ runner.os }} == 'Windows' ]]; then + llvm_root=$(echo "$llvm_root" | sed 's/\\/\//g') + llvm_root=$(echo $llvm_root | sed 's|^/d/|D:/|') + echo "$llvm_root" + fi + echo -E "llvm-root=$llvm_root" >> $GITHUB_OUTPUT + - name: LLVM Binaries id: llvm-cache if: steps.website-releases.outputs.exists != 'true' uses: actions/cache@v4 with: - path: ${{ github.workspace }}/${{ matrix.llvm-root }} + path: ${{ steps.resolve-llvm-root.outputs.llvm-root }} key: ${{ matrix.llvm-cache-key }} - name: Compress LLVM