https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5ce9e2ec8ec32071c18565d715ff86f788f604b9

commit 5ce9e2ec8ec32071c18565d715ff86f788f604b9
Author:     Serge Gautherie <[email protected]>
AuthorDate: Mon May 24 08:56:17 2021 +0200
Commit:     Jérôme Gardou <[email protected]>
CommitDate: Mon May 31 16:04:49 2021 +0200

    [GITHUB] build.yml: Define CLANG_VERSION for clang only
    
    Addendum to a66214c.
---
 .github/workflows/build.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a037c8e7140..27f7f3835f9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -37,6 +37,7 @@ jobs:
         wget https://apt.llvm.org/llvm.sh
         chmod +x llvm.sh
         sudo ./llvm.sh $LLVM_VERSION
+        echo "D_CLANG_VERSION=-DCLANG_VERSION=$LLVM_VERSION" >> $GITHUB_ENV
     - name: Source checkout
       uses: actions/checkout@v2
       with:
@@ -58,7 +59,7 @@ jobs:
       if: ${{ matrix.compiler == 'gcc' }}
       run: echo 
"CCACHE_COMPILERCHECK=string:${{steps.get_rosbe_spec.outputs.git-sha}}-${{hashfiles('./build_rosbe_ci.sh')}}"
 >> $GITHUB_ENV
     - name: Configure
-      run: echo 'cmake -S ${{github.workspace}}/src -B 
${{github.workspace}}/build -G Ninja 
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake 
-DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 
-DENABLE_ROSAPPS=1 -DCLANG_VERSION=${{env.LLVM_VERSION}}' | 
${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
+      run: echo 'cmake -S ${{github.workspace}}/src -B 
${{github.workspace}}/build -G Ninja 
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=toolchain-${{matrix.compiler}}.cmake 
-DARCH:STRING=${{matrix.arch}} -DENABLE_CCACHE=1 -DENABLE_ROSTESTS=1 
-DENABLE_ROSAPPS=1 ${{env.D_CLANG_VERSION}}' | 
${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
     - name: Build
       run: echo 'cmake --build ${{github.workspace}}/build -- -k0' | 
${{github.workspace}}/RosBE-CI/RosBE.sh . 0 ${{matrix.arch}}
     - name: Generate ISOs

Reply via email to