Skip to content

Commit 48abd27

Browse files
committed
CD: use the "new" way of using CMake.
1 parent 3ba4bcf commit 48abd27

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

.github/workflows/cd.yml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,9 @@ jobs:
2727
export DOXYGEN_RELEASE=Release_${{ env.DOXYGEN_VERSION }}
2828
wget https://github.com/doxygen/doxygen/archive/refs/tags/${DOXYGEN_RELEASE}.tar.gz -O - | tar -xz
2929
cd doxygen-${DOXYGEN_RELEASE}
30-
mkdir build
31-
cd build
32-
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release ..
33-
ninja
34-
cd bin
30+
cmake -G Ninja -S . -B build -DCMAKE_BUILD_TYPE=Release
31+
cmake --build build
32+
cd build/bin
3533
tar -cz doxygen -f ${{ github.workspace }}/doxygen.tar.gz
3634
ls -lh ${{ github.workspace }}
3735
- name: Upload Doxygen artifact
@@ -60,11 +58,9 @@ jobs:
6058
run: |
6159
wget https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${{ env.LLVMCLANG_VERSION }}.tar.gz -O - | tar -xz
6260
cd llvm-project-llvmorg-${{ env.LLVMCLANG_VERSION }}
63-
mkdir build
64-
cd build
65-
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" -DLLVM_TARGETS_TO_BUILD=X86 ../llvm
66-
ninja
67-
cd bin
61+
cmake -G Ninja -S llvm -B build -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS="clang;clang-tools-extra" -DLLVM_TARGETS_TO_BUILD=X86
62+
cmake --build build
63+
cd build/bin
6864
\rm clang
6965
cp -p clang-${{ env.LLVMCLANG_MAJOR_VERSION }} clang
7066
tar -cz clang -f ${{ github.workspace }}/clang.tar.gz

0 commit comments

Comments
 (0)