Skip to content

Commit

Permalink
Update ci.yml
Browse files Browse the repository at this point in the history
  • Loading branch information
mcbarton authored Jan 22, 2024
1 parent 480cba0 commit 673fdd3
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ jobs:
echo "CC=clang-${vers}" >> $GITHUB_ENV
echo "CXX=clang++-${vers}" >> $GITHUB_ENV
fi
cd ../..
env:
compiler: ${{ matrix.compiler }}

Expand All @@ -340,7 +340,6 @@ jobs:
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
fi
cd ../..
env:
compiler: ${{ matrix.compiler }}

Expand Down Expand Up @@ -368,7 +367,6 @@ jobs:
{
echo "Unsupported compiler - fix YAML file"
}
cd ..\..
- name: Install deps on Linux
if: runner.os == 'Linux'
Expand Down Expand Up @@ -404,6 +402,7 @@ jobs:
- name: Build LLVM/Cling on Unix systems if the cache is invalid
if: ${{ runner.os != 'windows' && steps.cache.outputs.cache-hit != 'true' }}
run: |
cd ..
cling_on=$(echo "${{ matrix.cling }}" | tr '[:lower:]' '[:upper:]')
if [[ "${cling_on}" == "ON" ]]; then
git clone https://github.com/root-project/cling.git
Expand Down Expand Up @@ -457,7 +456,7 @@ jobs:
- name: Build LLVM/Cling on Windows systems if the cache is invalid
if: ${{ runner.os == 'windows' && steps.cache.outputs.cache-hit != 'true' }}
run: |
cd ..
if ( "${{ matrix.cling }}" -imatch "On" )
{
git clone https://github.com/root-project/cling.git
Expand Down

0 comments on commit 673fdd3

Please sign in to comment.