diff options
| author | Kitzunu <24550914+Kitzunu@users.noreply.github.com> | 2023-11-26 17:27:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-26 17:27:40 +0100 |
| commit | 4a25ac665de88f6944cc5f2df6d0a5a043866113 (patch) | |
| tree | 4944f5e0443d4422846bf412cd0bc20236cce565 /apps | |
| parent | f7d7c4feb7a8f9c63bc4c94ebd48f1771d07958a (diff) | |
chore(CI): Make some changes (#17861)
* chore(CI): Make some changes. Less CI's maybe better...
* pendingsql
* FORK TEST - TO BE REVERTED
* changes
* test
* fix
* Revert "FORK TEST - TO BE REVERTED"
This reverts commit 875bc281c5a355cce2ddd8015484e256dbc185cf.
* rename workflow
* rename workflow
* rename workflow
* rename workflow
* I argue windows don't need dry runs
* maybe mac wants to be alive. who knows. When do we drop mac support really...?
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/ci/ci-conf-core-pch.sh | 69 | ||||
| -rw-r--r-- | apps/installer/includes/os_configs/osx.sh | 2 |
2 files changed, 70 insertions, 1 deletions
diff --git a/apps/ci/ci-conf-core-pch.sh b/apps/ci/ci-conf-core-pch.sh new file mode 100644 index 0000000000..106b3e0bec --- /dev/null +++ b/apps/ci/ci-conf-core-pch.sh @@ -0,0 +1,69 @@ +#!/bin/bash + +set -e + +cat >>conf/config.sh <<CONFIG_SH +MTHREADS=$(($(grep -c ^processor /proc/cpuinfo) + 2)) +CWARNINGS=ON +CDEBUG=OFF +CTYPE=Release +CTOOLS_BUILD=none +CSCRIPTS=static +CMODULES=static +CBUILD_TESTING=ON +CSCRIPTPCH=ON +CCOREPCH=ON +CCUSTOMOPTIONS='-DCMAKE_C_COMPILER_LAUNCHER=ccache -DCMAKE_CXX_COMPILER_LAUNCHER=ccache -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror"' +CONFIG_SH + +case $COMPILER in + + # this is in order to use the "default" gcc version of the OS, without forcing a specific version + "gcc" ) + time sudo apt-get install -y gcc g++ + echo "CCOMPILERC=\"gcc\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"g++\"" >> ./conf/config.sh + ;; + + "gcc8" ) + time sudo apt-get install -y gcc-8 g++-8 + echo "CCOMPILERC=\"gcc-8\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"g++-8\"" >> ./conf/config.sh + ;; + + "gcc10" ) + time sudo apt-get install -y gcc-10 g++-10 + echo "CCOMPILERC=\"gcc-10\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"g++-10\"" >> ./conf/config.sh + ;; + + # this is in order to use the "default" clang version of the OS, without forcing a specific version + "clang" ) + time sudo apt-get install -y clang + echo "CCOMPILERC=\"clang\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++\"" >> ./conf/config.sh + ;; + + "clang10" ) + time sudo apt-get install -y clang-10 + echo "CCOMPILERC=\"clang-10\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-10\"" >> ./conf/config.sh + ;; + + "clang11" ) + time sudo apt-get install -y clang-11 + echo "CCOMPILERC=\"clang-11\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-11\"" >> ./conf/config.sh + ;; + + "clang12" ) + time sudo apt-get install -y clang-12 + echo "CCOMPILERC=\"clang-12\"" >> ./conf/config.sh + echo "CCOMPILERCXX=\"clang++-12\"" >> ./conf/config.sh + ;; + + * ) + echo "Unknown compiler $COMPILER" + exit 1 + ;; +esac diff --git a/apps/installer/includes/os_configs/osx.sh b/apps/installer/includes/os_configs/osx.sh index 7088f0d582..131efd466b 100644 --- a/apps/installer/includes/os_configs/osx.sh +++ b/apps/installer/includes/os_configs/osx.sh @@ -26,4 +26,4 @@ if ! command -v cmake &>/dev/null ; then fi ########################################## -brew install openssl@3 readline boost@1.76 bash-completion curl unzip mysql@8.1 ccache +brew install openssl@3 readline boost bash-completion curl unzip mysql@8.1 ccache |