From 20258ce8a209fcf4e3ab68c97a4298a6d080aa24 Mon Sep 17 00:00:00 2001 From: Emily Mabrey Date: Sat, 11 Sep 2021 15:01:00 -0400 Subject: [PATCH 1/4] Add skip logic to Github CI Skip duplicate CI runs with the same content Skip concurrent CI runs of the same content Cancel old CI runs when a newer commit is pushed on top of a branch Skip CI builds which change documentation and non-build related config files Signed-off-by: Emily Mabrey --- .github/workflows/cmake_build.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/.github/workflows/cmake_build.yml b/.github/workflows/cmake_build.yml index 30f286133d..fbea93b4d7 100644 --- a/.github/workflows/cmake_build.yml +++ b/.github/workflows/cmake_build.yml @@ -12,7 +12,38 @@ defaults: shell: bash jobs: + + skip_test: + name: "CI Build Skipping Logic" + runs-on: ubuntu-latest + permissions: + actions: write + checks: read + contents: read + deployments: read + issues: read + discussions: read + packages: read + pull-requests: read + repository-projects: read + security-events: read + statuses: read + outputs: + should_skip: ${{ steps.skip_check.outputs.should_skip }} + steps: + - id: skip_check + uses: fkirc/skip-duplicate-actions@master + with: + paths: '[]' + paths_ignore: '["**/**.md", "**/**.dox2", "**/**.dox", "**/**.dox.in", "**/LICENSE.txt", "/.builds/**", "/.github/ISSUE_TEMPLATE/**", "/.github/funding.yml", "/.vscode/**"]' + do_not_skip: '["workflow_dispatch", "schedule"]' + cancel_others: 'true' + skip_after_successful_duplicate: 'true' + concurrent_skipping: 'same_content_newer' + build: + needs: skip_test + if: ${{ needs.skip_test.outputs.should_skip != 'true' }} name: ${{ matrix.config.name }} runs-on: ${{ matrix.config.os }} strategy: From d667a15017a80819232ebef517e408f40fb89500 Mon Sep 17 00:00:00 2001 From: Emily Mabrey Date: Sat, 11 Sep 2021 15:24:18 -0400 Subject: [PATCH 2/4] Disable Flatpak builds on PR Flatpak builds will only run on merge to master and when manually triggered Signed-off-by: Emily Mabrey --- .github/workflows/flatpak.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml index b69c55ff42..aa7871ba65 100644 --- a/.github/workflows/flatpak.yml +++ b/.github/workflows/flatpak.yml @@ -2,7 +2,8 @@ name: Packaging on: push: branches: [master] - pull_request: + workflow_dispatch: + jobs: flatpak: name: "Flatpak" From 3e5286a7e07fac58eb11d994a15528838eed1160 Mon Sep 17 00:00:00 2001 From: Be Date: Sat, 4 Sep 2021 19:51:45 -0500 Subject: [PATCH 3/4] Fix mixup of vamp-sdk release and debug libraries There were two problems: 1. The vamp-sdk vcpkg port added a `d` suffix for debug builds that upstream did not. 2. The vamp-sdk vcpkg port used the same file name for libraries on every OS but that is not what upstream does. Signed-off-by: Be --- cmake-modules/FindVampHostSDK.cmake | 4 +++- vcpkg | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/cmake-modules/FindVampHostSDK.cmake b/cmake-modules/FindVampHostSDK.cmake index 51947a40a6..0f179a2d8d 100644 --- a/cmake-modules/FindVampHostSDK.cmake +++ b/cmake-modules/FindVampHostSDK.cmake @@ -50,7 +50,9 @@ find_path(VampHostSDK_INCLUDE_DIR mark_as_advanced(VampHostSDK_INCLUDE_DIR) find_library(VampHostSDK_LIBRARY - NAMES vamp-hostsdk + # The library has different file names on Windows (VampHostSDK) compared + # to Linux and macOS (vamp-hostsdk). + NAMES vamp-hostsdk VampHostSDK PATHS ${PC_VampHostSDK_LIBRARY_DIRS} DOC "VampHostSDK library" ) diff --git a/vcpkg b/vcpkg index f8d74b5224..9c84b39700 160000 --- a/vcpkg +++ b/vcpkg @@ -1 +1 @@ -Subproject commit f8d74b5224513183a71199f60e25d741af984abf +Subproject commit 9c84b3970064eaedb405990797d79a93186b1e08 From 5cdd33af1bbbd7cde550d2632c5e2d2005f69cfa Mon Sep 17 00:00:00 2001 From: Emily Mabrey Date: Sun, 12 Sep 2021 20:36:09 -0400 Subject: [PATCH 4/4] Change flatpak modules to CMake Modify wxwidgets module to use `cmake-ninja` Signed-off-by: Emily Mabrey --- packaging/flatpak/org.tenacity.Tenacity.json | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/packaging/flatpak/org.tenacity.Tenacity.json b/packaging/flatpak/org.tenacity.Tenacity.json index cefc6547b4..e267b19558 100644 --- a/packaging/flatpak/org.tenacity.Tenacity.json +++ b/packaging/flatpak/org.tenacity.Tenacity.json @@ -41,19 +41,18 @@ "modules": [ { "name": "wxwidgets", - "rm-configure": true, + "buildsystem": "cmake-ninja", "config-opts": [ - "--with-libpng", - "--with-zlib", - "--with-cxx=17", - "--disable-sdltest", - "--disable-webview", - "--disable-webviewwebkit", - "--disable-ribbon", - "--disable-propgrid", - "--disable-richtext", - "--with-expat=builtin", - "--with-libiconv=/usr" + "-D wxUSE_LIBPNG=builtin", + "-D wxUSE_ZLIB=builtin", + "-D wxBUILD_CXX_STANDARD=17", + "-D wxBUILD_TESTS=OFF", + "-D wxUSE_WEBVIEW=OFF", + "-D wxUSE_WEBVIEW_WEBKIT=OFF", + "-D wxUSE_RIBBON=OFF", + "-D wxUSE_PROPGRID=OFF", + "-D wxUSE_RICHTEXT=OFF", + "-D wxUSE_EXPAT=builtin" ], "cleanup": [ "/share/bakefile" @@ -161,6 +160,7 @@ }, { "name": "soundtouch", + "buildsystem": "cmake-ninja", "sources": [ { "type": "git", @@ -185,8 +185,8 @@ "buildsystem": "cmake-ninja", "builddir": true, "config-opts": [ - "-DCMAKE_BUILD_TYPE=RelWithDebInfo", - "-DWX_CONFIG=/app/bin/wx-config" + "-D CMAKE_BUILD_TYPE=RelWithDebInfo", + "-D WX_CONFIG=/app/bin/wx-config" ], "post-install": [ "install -Dm644 ../help/tenacity.metainfo.xml -t /app/share/metainfo",