diff --git a/.github/workflows/build_linux_x86.yml b/.github/workflows/build_linux_x86.yml index 557da3502..8a8a1fe03 100644 --- a/.github/workflows/build_linux_x86.yml +++ b/.github/workflows/build_linux_x86.yml @@ -31,15 +31,14 @@ jobs: echo "Done" echo && echo "** Installing and setting up compiler and tools" && echo - sudo apt install -yqq --no-install-recommends ninja-build linux-libc-dev:i386 gcc-12 gcc-12-multilib g++-12 g++-12-multilib > /dev/null + sudo apt-get install -yqq --no-install-recommends \ + ninja-build linux-libc-dev:i386 gcc-12 gcc-12-multilib g++-12 g++-12-multilib \ + ccache \ + libc6:i386 libgcc-s1:i386 zlib1g:i386 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12 echo "Done" # MariaDB dependencies - echo && echo "Install MariaDB dependencies" - echo "Installing some deps with apt..." - sudo apt install -yqq --no-install-recommends libc6:i386 libgcc-s1:i386 zlib1g:i386 - echo "Installing libssl1.1 manually from Bionic repo..." wget --quiet --output-document=dep1.deb http://launchpadlibrarian.net/367327733/libssl1.1_1.1.0g-2ubuntu4_i386.deb sudo dpkg -r --force-all libssl1.1 @@ -75,6 +74,10 @@ jobs: ls /usr/lib/i386-linux-gnu/mariadb echo "Done" + - name: Set up ccache + uses: hendrikmuhs/ccache-action@v1 + with: + key: ${{github.job}} - name: Report building tools run: | @@ -85,9 +88,12 @@ jobs: - name: CMake run: | mkdir -p build - cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86.cmake -S ./ -B ./build + cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" \ + -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86.cmake \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -S ./ -B ./build - name: Ninja - run: cd build && ninja && cd .. + run: ninja -C build - name: Create package run: | mkdir accounts logs save scripts diff --git a/.github/workflows/build_linux_x86_64.yml b/.github/workflows/build_linux_x86_64.yml index efe9296ae..772f492c6 100644 --- a/.github/workflows/build_linux_x86_64.yml +++ b/.github/workflows/build_linux_x86_64.yml @@ -26,9 +26,17 @@ jobs: lsb_release -d sudo add-apt-repository universe && sudo sudo apt-get -qq update - sudo apt install -yq --no-install-recommends ninja-build gcc-12 g++-12 > /dev/null - sudo apt install -yq --no-install-recommends mariadb-client libmariadb-dev + sudo apt-get install -yq --no-install-recommends \ + ninja-build gcc-12 g++-12 \ + ccache \ + mariadb-client libmariadb-dev sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12 + + - name: Set up ccache + uses: hendrikmuhs/ccache-action@v1 + with: + key: ${{github.job}} + - name: Report building tools run: | echo "GCC:" && gcc -v @@ -38,9 +46,12 @@ jobs: - name: CMake run: | mkdir -p build - cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86_64.cmake -S ./ -B ./build + cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" \ + -DCMAKE_TOOLCHAIN_FILE=cmake/toolchains/Linux-GNU-x86_64.cmake \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -S ./ -B ./build - name: Ninja - run: cd build && ninja && cd .. + run: ninja -C build - name: Create package run: | mkdir accounts logs save scripts diff --git a/.github/workflows/build_osx_arm.yml b/.github/workflows/build_osx_arm.yml index d72618273..d5ac00a68 100644 --- a/.github/workflows/build_osx_arm.yml +++ b/.github/workflows/build_osx_arm.yml @@ -45,7 +45,7 @@ jobs: mkdir -p build cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TCH" -S . -B ./build - name: Ninja - run: cd build && ninja && cd .. + run: ninja -C build - name: Create package run: | pwd diff --git a/.github/workflows/build_osx_x86_64.yml b/.github/workflows/build_osx_x86_64.yml index 41a4d4dc5..fb6e30401 100644 --- a/.github/workflows/build_osx_x86_64.yml +++ b/.github/workflows/build_osx_x86_64.yml @@ -43,7 +43,7 @@ jobs: mkdir -p build cmake -G "Ninja" -DCMAKE_BUILD_TYPE="Nightly" -DCMAKE_TOOLCHAIN_FILE="$CMAKE_TCH" -S . -B ./build - name: Ninja - run: cd build && ninja && cd .. + run: ninja -C build - name: Create package run: | pwd diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index bc25dba95..d5e4795aa 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -44,8 +44,9 @@ jobs: lsb_release -d sudo add-apt-repository universe && sudo sudo apt-get -qq update - sudo apt install -yq --no-install-recommends ninja-build gcc-12 g++-12 > /dev/null - sudo apt install -yq --no-install-recommends mariadb-client libmariadb-dev + sudo apt-get install -yq --no-install-recommends \ + ninja-build gcc-12 g++-12 \ + mariadb-client libmariadb-dev sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12 - name: Report building tools diff --git a/.github/workflows/coverity-scan.yml b/.github/workflows/coverity-scan.yml index 87bfa6cd7..264d146c9 100644 --- a/.github/workflows/coverity-scan.yml +++ b/.github/workflows/coverity-scan.yml @@ -29,8 +29,9 @@ jobs: - name: Install prerequisites run: | sudo add-apt-repository universe && sudo sudo apt-get -qq update - sudo apt install -yq --no-install-recommends ninja-build gcc-12 g++-12 > /dev/null - sudo apt install -yq --no-install-recommends mariadb-client libmariadb-dev + sudo apt-get install -yq --no-install-recommends \ + ninja-build gcc-12 g++-12 \ + mariadb-client libmariadb-dev sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 90 --slave /usr/bin/g++ g++ /usr/bin/g++-12 - name: Report building tools