Skip to content

Commit ddf947e

Browse files
committed
github: Run the run-cmake-tests.sh script as part of other smoke tests
1 parent d74c7c9 commit ddf947e

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

.github/workflows/build.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ jobs:
8484
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
8585
./test-libcxx-module.sh $(pwd)/install/llvm-mingw
8686
./run-tests.sh $(pwd)/install/llvm-mingw
87+
./run-cmake-tests.sh $(pwd)/install/llvm-mingw
8788
cd install
8889
DISTRO=ubuntu-$(grep DISTRIB_RELEASE /etc/lsb-release | cut -f 2 -d =)-$(uname -m)
8990
NAME=llvm-mingw-stage1-$TAG-ucrt-$DISTRO
@@ -157,6 +158,7 @@ jobs:
157158
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
158159
./test-libcxx-module.sh $(pwd)/install/llvm-mingw
159160
./run-tests.sh $(pwd)/install/llvm-mingw
161+
./run-cmake-tests.sh $(pwd)/install/llvm-mingw
160162
cd install
161163
DISTRO=ubuntu-$(grep DISTRIB_RELEASE /etc/lsb-release | cut -f 2 -d =)-$(uname -m)
162164
NAME=llvm-mingw-$TAG-ucrt-$DISTRO
@@ -204,6 +206,7 @@ jobs:
204206
sudo apt-get update && sudo apt-get install qemu-user-static libc6-arm64-cross libstdc++6-arm64-cross
205207
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu ./test-libcxx-module.sh $(pwd)/install/llvm-mingw
206208
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu ./run-tests.sh $(pwd)/install/llvm-mingw
209+
QEMU_LD_PREFIX=/usr/aarch64-linux-gnu ./run-cmake-tests.sh $(pwd)/install/llvm-mingw
207210
- name: Package the toolchain
208211
env:
209212
TAG: ${{needs.prepare.outputs.TAG}}
@@ -247,6 +250,7 @@ jobs:
247250
LLVM_CMAKEFLAGS="-DLLVM_ENABLE_LIBXML2=OFF" ./build-all.sh $(pwd)/install/llvm-mingw --disable-clang-tools-extra --disable-lldb --enable-asserts
248251
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
249252
./run-tests.sh $(pwd)/install/llvm-mingw
253+
./run-cmake-tests.sh $(pwd)/install/llvm-mingw
250254
cd install
251255
tar -Jcf ../llvm-mingw-linux.tar.xz --format=ustar --numeric-owner --owner=0 --group=0 --sort=name --mtime="$BUILD_DATE" llvm-mingw
252256
- uses: actions/upload-artifact@v4
@@ -318,6 +322,7 @@ jobs:
318322
.github/workflows/store-version.sh install/llvm-mingw/versions.txt
319323
./test-libcxx-module.sh $(pwd)/install/llvm-mingw
320324
./run-tests.sh $(pwd)/install/llvm-mingw
325+
./run-cmake-tests.sh $(pwd)/install/llvm-mingw
321326
cd install
322327
NAME=llvm-mingw-$TAG-ucrt-macos-universal
323328
mv llvm-mingw $NAME
@@ -374,6 +379,7 @@ jobs:
374379
./copy-msys-dependencies.sh $(pwd)/install/llvm-mingw ${{matrix.sys}}
375380
./test-libcxx-module.sh $(pwd)/install/llvm-mingw
376381
./run-tests.sh $(pwd)/install/llvm-mingw
382+
./run-cmake-tests.sh $(pwd)/install/llvm-mingw
377383
cd install
378384
NAME=llvm-mingw-$TAG-ucrt-msys2-${{matrix.sys}}
379385
mv llvm-mingw $NAME
@@ -457,6 +463,9 @@ jobs:
457463
install: >-
458464
unzip
459465
make
466+
pacboy: >-
467+
cmake:p
468+
ninja:p
460469
- uses: actions/download-artifact@v4
461470
with:
462471
name: windows-ucrt-${{matrix.arch}}-toolchain
@@ -471,6 +480,7 @@ jobs:
471480
./test-libcxx-module.sh /llvm-mingw
472481
./run-tests.sh /llvm-mingw
473482
./run-lldb-tests.sh /llvm-mingw
483+
./run-cmake-tests.sh /llvm-mingw
474484
475485
# Run libcxx's tests with the cross-built toolchains from above.
476486
# (This builds its own copy of libcxx, but it should be pretty much

0 commit comments

Comments
 (0)