From 4f18eb85d2b70dd60ea40918edd24c26b737f71e Mon Sep 17 00:00:00 2001 From: Brain Date: Sat, 16 Sep 2023 16:49:08 +0100 Subject: [PATCH] ci: remove ninja for all but windows, for us it is slower than make -j2 (#857) --- .github/workflows/ci.yml | 30 +++++++++++++++--------------- cmake/ARM64ToolChain.cmake | 2 +- cmake/ARMv7ToolChain.cmake | 2 +- src/unittest/test.h | 4 ++-- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3be606ec8d..51349a730b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,15 +45,15 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Install apt packages - run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} ninja-build libsodium-dev libopus-dev zlib1g-dev rpm + run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} libsodium-dev libopus-dev zlib1g-dev rpm - name: Generate CMake - run: mkdir build && cd build && cmake -G Ninja -DDPP_NO_VCPKG=ON -DAVX_TYPE=T_fallback -DCMAKE_BUILD_TYPE=Release .. + run: mkdir build && cd build && cmake -DDPP_NO_VCPKG=ON -DAVX_TYPE=T_fallback -DCMAKE_BUILD_TYPE=Release .. env: CXX: ${{matrix.cfg.cpp-version}} - name: Build Project - run: cd build && ninja + run: cd build && make -j2 - name: Run unit tests run: cd build/library && ./unittest @@ -87,15 +87,15 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Install apt packages - run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} ninja-build libsodium-dev libopus-dev zlib1g-dev rpm + run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install ${{ matrix.cfg.cpp-version }} libsodium-dev libopus-dev zlib1g-dev rpm - name: Generate CMake - run: mkdir build && cd build && cmake -G Ninja -DDPP_NO_VCPKG=ON -DAVX_TYPE=T_fallback -DCMAKE_BUILD_TYPE=Release ${{matrix.cfg.cmake-flags}} .. + run: mkdir build && cd build && cmake -DDPP_NO_VCPKG=ON -DAVX_TYPE=T_fallback -DCMAKE_BUILD_TYPE=Release ${{matrix.cfg.cmake-flags}} .. env: CXX: ${{matrix.cfg.cpp-version}} - name: Build Project - run: cd build && ninja + run: cd build && make -j2 - name: Package distributable if: ${{ matrix.cfg.cpp-version == 'g++-10' }} @@ -128,15 +128,15 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Install homebrew packages - run: brew install cmake ninja libsodium opus openssl + run: brew install cmake make libsodium opus openssl - name: Generate CMake - run: mkdir build && cd build && cmake -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DDPP_CORO=ON -DAVX_TYPE=T_fallback -G Ninja .. + run: mkdir build && cd build && cmake -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DDPP_CORO=ON -DAVX_TYPE=T_fallback .. env: DONT_RUN_VCPKG: true - name: Build Project - run: cd build && ninja + run: cd build && make -j2 env: DONT_RUN_VCPKG: true @@ -186,7 +186,7 @@ jobs: DONT_RUN_VCPKG: true - name: Build Project - run: cmake --build main/build --target dpp --config ${{matrix.cfg.config}} + run: cmake --build main/build --target dpp --config ${{matrix.cfg.config}} --parallel 2 env: DONT_RUN_VCPKG: true @@ -227,16 +227,16 @@ jobs: uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0 - name: Install Packages - run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install cmake ninja-build rpm + run: sudo sed -i 's/azure\.//' /etc/apt/sources.list && sudo apt update && sudo apt install cmake rpm - name: Generate CMakeFiles - run: mkdir build && cd build && sudo cmake ${{matrix.cfg.cmake-options}} -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DAVX_TYPE=T_fallback -G Ninja .. + run: mkdir build && cd build && sudo cmake ${{matrix.cfg.cmake-options}} -DDPP_NO_VCPKG=ON -DCMAKE_BUILD_TYPE=Release -DAVX_TYPE=T_fallback .. - name: Compile Source - run: cd build && sudo ninja + run: cd build && sudo make -j2 - name: Package Distributable - run: cd build && cpack --verbose + run: cd build && sudo cpack --verbose || cat /home/runner/work/DPP/DPP/build/_CPack_Packages/Linux/DEB/PreinstallOutput.log - name: Upload Binaries (DEB) uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2 @@ -260,7 +260,7 @@ jobs: # uses: vmactions/freebsd-vm@v0.1.5 # with: # usesh: true -# prepare: pkg install -y openssl-devel gcc gmake ninja cmake git +# prepare: pkg install -y openssl-devel gcc gmake cmake git # run: | # pwd # ls -lah diff --git a/cmake/ARM64ToolChain.cmake b/cmake/ARM64ToolChain.cmake index 7c09aa4503..8087e3f375 100644 --- a/cmake/ARM64ToolChain.cmake +++ b/cmake/ARM64ToolChain.cmake @@ -47,6 +47,6 @@ EXECUTE_PROCESS(COMMAND sudo mv TMPFILE /etc/apt/sources.list) EXECUTE_PROCESS(COMMAND sudo dpkg --add-architecture arm64) EXECUTE_PROCESS(COMMAND sudo apt-add-repository -y ppa:canonical-kernel-team/ppa) EXECUTE_PROCESS(COMMAND sudo apt update) -EXECUTE_PROCESS(COMMAND sudo apt install -y cmake ninja-build gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu libc6-dev-arm64-cross zlib1g-dev:arm64 libssl-dev:arm64 libopus-dev:arm64 libsodium-dev:arm64) +EXECUTE_PROCESS(COMMAND sudo apt install -y cmake gcc-8-aarch64-linux-gnu g++-8-aarch64-linux-gnu libc6-dev-arm64-cross zlib1g-dev:arm64 libssl-dev:arm64 libopus-dev:arm64 libsodium-dev:arm64) EXECUTE_PROCESS(COMMAND sudo mv /usr/lib/aarch64-linux-gnu/pkgconfig/libsodium.pc /usr/lib/pkgconfig/) diff --git a/cmake/ARMv7ToolChain.cmake b/cmake/ARMv7ToolChain.cmake index e5daa0cab8..7b9bacf3bc 100644 --- a/cmake/ARMv7ToolChain.cmake +++ b/cmake/ARMv7ToolChain.cmake @@ -46,6 +46,6 @@ EXECUTE_PROCESS(COMMAND printf "deb [arch=amd64] http://archive.ubuntu.com/ubunt EXECUTE_PROCESS(COMMAND sudo mv TMPFILE /etc/apt/sources.list) EXECUTE_PROCESS(COMMAND sudo dpkg --add-architecture armhf) EXECUTE_PROCESS(COMMAND sudo apt update) -EXECUTE_PROCESS(COMMAND sudo apt install -y cmake ninja-build gcc-8-arm-linux-gnueabihf g++-8-arm-linux-gnueabihf zlib1g-dev:armhf libssl-dev:armhf libopus-dev:armhf libsodium-dev:armhf) +EXECUTE_PROCESS(COMMAND sudo apt install -y cmake gcc-8-arm-linux-gnueabihf g++-8-arm-linux-gnueabihf zlib1g-dev:armhf libssl-dev:armhf libopus-dev:armhf libsodium-dev:armhf) EXECUTE_PROCESS(COMMAND sudo mv /usr/lib/arm-linux-gnueabihf/pkgconfig/libsodium.pc /usr/lib/pkgconfig/) diff --git a/src/unittest/test.h b/src/unittest/test.h index 865a2abb47..96d531e0a4 100644 --- a/src/unittest/test.h +++ b/src/unittest/test.h @@ -93,8 +93,6 @@ DPP_TEST(MESSAGERECEIVE, "Receipt of a created message", tf_online); DPP_TEST(MESSAGEFILE, "Message attachment send and check", tf_online); DPP_TEST(CACHE, "Test guild cache", tf_online); DPP_TEST(USERCACHE, "Test user cache", tf_online); -DPP_TEST(VOICECONN, "Connect to voice channel", tf_online); -DPP_TEST(VOICESEND, "Send audio to voice channel", tf_online); DPP_TEST(REACT, "React to a message", tf_online); DPP_TEST(REACTEVENT, "Reaction event", tf_online); DPP_TEST(GUILDCREATE, "Receive guild create event", tf_online); @@ -221,6 +219,8 @@ DPP_TEST(INVITE_DELETE, "cluster::invite_delete", tf_online); /* Extended set -- Less important, skipped on the master branch due to rate limits and GitHub actions limitations*/ /* To execute, run unittests with "full" command line argument */ +DPP_TEST(VOICECONN, "Connect to voice channel", tf_online | tf_extended); +DPP_TEST(VOICESEND, "Send audio to voice channel", tf_online | tf_extended); // udp unreliable on gitbub DPP_TEST(MESSAGEPIN, "Pinning a channel message", tf_online | tf_extended); DPP_TEST(MESSAGEUNPIN, "Unpinning a channel message", tf_online | tf_extended);