From ac81edd479b59dc658832ee1b4fa5c7fc684440d Mon Sep 17 00:00:00 2001 From: silverqx Date: Fri, 7 Jun 2024 11:12:38 +0200 Subject: [PATCH] workflows testing Fedora --- .github/workflows/analyzers.yml | 2 +- .github/workflows/linux-qt6-drivers.yml | 16 ++++++++-------- .github/workflows/vcpkg-linux-drivers.yml | 4 ++-- .github/workflows/vcpkg-linux.yml | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/analyzers.yml b/.github/workflows/analyzers.yml index 065e24e0d..1cee70685 100644 --- a/.github/workflows/analyzers.yml +++ b/.github/workflows/analyzers.yml @@ -191,7 +191,7 @@ jobs: -S . -B '${{ env.TinyORMBuildTree }}' -G Ninja - -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=/usr/local/bin/ccache + -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache -D CMAKE_CXX_COMPILER:FILEPATH=/usr/bin/clang++-18 -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -D CMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON diff --git a/.github/workflows/linux-qt6-drivers.yml b/.github/workflows/linux-qt6-drivers.yml index fe279b406..2155817b8 100644 --- a/.github/workflows/linux-qt6-drivers.yml +++ b/.github/workflows/linux-qt6-drivers.yml @@ -49,8 +49,8 @@ jobs: - key: clang18 command: clang++-18 - - key: gcc13 - command: g++-13 + - key: gcc14 + command: g++-14 include: - lto: ON @@ -68,8 +68,8 @@ jobs: key: release name: Release compiler: - key: gcc13 - command: g++-13 + key: gcc14 + command: g++-14 steps: - uses: actions/checkout@v4 @@ -87,13 +87,13 @@ jobs: # gh workflow run --ref silverqx-develop # -- # The description below is Outdated but I leave the comment. - # For gcc13 with the parallel 4 I saw 15.1GB maximum memory usage from 15.6GB and that is + # For gcc14 with the parallel 4 I saw 15.1GB maximum memory usage from 15.6GB and that is # very close to the edge, so I have to decrease it to 3. # For clang18 it was ~11.6 from 15.6GB so parallel 8 is ok. # I must divide all parallel by 2 because I have 2 self-hosted runners on the same computer # and also -1 for reserve to avoid swapping, so for clang: 8 / 2 - 1 = 3 and for gcc: # 3 / 2 - 1 = 1. - parallel=${{ matrix.compiler.key == 'gcc13' && '3' || '8' }} + parallel=${{ matrix.compiler.key == 'gcc14' && '3' || '8' }} echo "TinyParallel=$parallel" >> $GITHUB_ENV tinyormPath=$(realpath ./main) @@ -224,7 +224,7 @@ jobs: -S . -B '${{ env.TinyORMBuildTree }}' -G Ninja - -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=/usr/local/bin/ccache + -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache -D CMAKE_CXX_COMPILER:FILEPATH='/usr/bin/${{ matrix.compiler.command }}' -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -D CMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=ON @@ -320,7 +320,7 @@ jobs: # the reason for this is to always have the latest tom_testdata and to avoid manual rebuilds if # any shared library is updated on which the tom_testdata depends to avoid crashes. - name: Install tom_testdata for vcpkg-linux-drivers.yml - if: matrix.compiler.key == 'gcc13' && matrix.drivers-type == 'Static' && matrix.build-type.key == 'release' + if: matrix.compiler.key == 'gcc14' && matrix.drivers-type == 'Static' && matrix.build-type.key == 'release' working-directory: ${{ env.TinyORMBuildTree }}/tests/testdata_tom run: | cp --force --target-directory="$(realpath ~/bin)" ./tom_testdata diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml index f5c65b388..1b4dd4169 100644 --- a/.github/workflows/vcpkg-linux-drivers.yml +++ b/.github/workflows/vcpkg-linux-drivers.yml @@ -340,7 +340,7 @@ jobs: -S . -B '${{ runner.workspace }}/TinyORM-builds-cmake/build-TinyDrivers-manual-gcc-${{ matrix.build-type.key }}' -G Ninja - -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=/usr/local/bin/ccache + -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -D CMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=OFF -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build-type.name }} @@ -455,7 +455,7 @@ jobs: -S . -B '${{ runner.workspace }}/HelloWorld-builds-cmake/build-TinyDrivers-fetchcontent-gcc-${{ matrix.build-type.key }}' -G Ninja - -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=/usr/local/bin/ccache + -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -D CMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=OFF -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build-type.name }} diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml index 0f812b783..803963f59 100644 --- a/.github/workflows/vcpkg-linux.yml +++ b/.github/workflows/vcpkg-linux.yml @@ -455,7 +455,7 @@ jobs: -S . -B '${{ runner.workspace }}/TinyORM-builds-cmake/build-manual-gcc-${{ matrix.build-type.key }}' -G Ninja - -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=/usr/local/bin/ccache + -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -D CMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=OFF -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build-type.name }} @@ -559,7 +559,7 @@ jobs: -S . -B '${{ runner.workspace }}/HelloWorld-builds-cmake/build-fetchcontent-gcc-${{ matrix.build-type.key }}' -G Ninja - -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=/usr/local/bin/ccache + -D CMAKE_CXX_COMPILER_LAUNCHER:FILEPATH=ccache -D CMAKE_TOOLCHAIN_FILE:FILEPATH="$VCPKG_INSTALLATION_ROOT/scripts/buildsystems/vcpkg.cmake" -D CMAKE_DISABLE_PRECOMPILE_HEADERS:BOOL=OFF -D CMAKE_BUILD_TYPE:STRING=${{ matrix.build-type.name }}