From d71116b82a0a20355eb0978b8fb5379a368ba2af Mon Sep 17 00:00:00 2001 From: Dalton Messmer Date: Wed, 8 May 2024 13:06:54 -0400 Subject: [PATCH] Update Linux CI to Ubuntu 20.04 (#7015) - Switch to Ubuntu 20.04 Docker image ghcr.io/lmms/linux.gcc:20.04 - Linux packages have migrated from Docker Hub to https://github.com/orgs/lmms/packages - Built using the Dockerfiles from Update Linux images lmms-ci-docker#15 - Updated the veal submodule to the latest commit on the default ladspa branch - Fixed an error when catching a polymorphic type with GCC 9. See: LMMS/veal@0ae9287 - Added GCC flag -Wno-format-truncation for ZynAddSubFx build. - Adds GCC flag -Wno-format-overflow for calf/veal build. Closes #6993 --- .github/workflows/build.yml | 12 ++++-------- plugins/LadspaEffect/calf/CMakeLists.txt | 4 +++- plugins/ZynAddSubFx/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 546fb017e9c..1926b593b2d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: linux: name: linux runs-on: ubuntu-latest - container: lmmsci/linux.gcc:18.04 + container: ghcr.io/lmms/linux.gcc:20.04 env: CMAKE_OPTS: >- -DUSE_WERROR=ON @@ -18,12 +18,8 @@ jobs: CCACHE_NOCOMPRESS: 1 MAKEFLAGS: -j2 steps: - - name: Update and configure Git - run: | - add-apt-repository ppa:git-core/ppa - apt-get update - apt-get --yes install git - git config --global --add safe.directory "$GITHUB_WORKSPACE" + - name: Configure git + run: git config --global --add safe.directory "$GITHUB_WORKSPACE" - name: Check out uses: actions/checkout@v3 with: @@ -62,7 +58,7 @@ jobs: run: | ccache --cleanup echo "[ccache config]" - ccache --print-config + ccache --show-config echo "[ccache stats]" ccache --show-stats env: diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt index 0c9cd8fa96e..67bdc5cd210 100644 --- a/plugins/LadspaEffect/calf/CMakeLists.txt +++ b/plugins/LadspaEffect/calf/CMakeLists.txt @@ -35,10 +35,12 @@ SET_TARGET_PROPERTIES(veal PROPERTIES PREFIX "") TARGET_COMPILE_DEFINITIONS(veal PRIVATE DISABLE_OSC=1) SET(INLINE_FLAGS "") +SET(OTHER_FLAGS "") IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") SET(INLINE_FLAGS -finline-functions-called-once -finline-limit=80) + SET(OTHER_FLAGS -Wno-format-overflow) ENDIF() -target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS}) +target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS} ${OTHER_FLAGS}) if(LMMS_BUILD_WIN32) add_custom_command( diff --git a/plugins/ZynAddSubFx/CMakeLists.txt b/plugins/ZynAddSubFx/CMakeLists.txt index 3369a793865..35dc08c4dbc 100644 --- a/plugins/ZynAddSubFx/CMakeLists.txt +++ b/plugins/ZynAddSubFx/CMakeLists.txt @@ -29,7 +29,7 @@ if(NOT MSVC) endif() IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" AND NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "6.0.0") - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation") + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation -Wno-format-truncation") ENDIF() IF(MINGW_PREFIX)