From 95b1c1396df293b9a684b8ca09d5f982f77b0767 Mon Sep 17 00:00:00 2001 From: jcm <6864788+jcm93@users.noreply.github.com> Date: Mon, 10 Feb 2025 07:23:45 -0600 Subject: [PATCH 1/4] build: Statically link libc++ when using GCC on Windows --- cmake/windows/compilerconfig.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/windows/compilerconfig.cmake b/cmake/windows/compilerconfig.cmake index c31bd8b27..10574f339 100644 --- a/cmake/windows/compilerconfig.cmake +++ b/cmake/windows/compilerconfig.cmake @@ -147,6 +147,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_link_options("$<$:${_ares_mingw_gcc_debug_link_options}>") add_compile_options(${_ares_gcc_common_options}) + add_link_options(-static-libstdc++) endif() # arch/machine-specific optimizations From 841db876f4a18f409aa030ade2ce544c40bfb67c Mon Sep 17 00:00:00 2001 From: jcm <6864788+jcm93@users.noreply.github.com> Date: Mon, 10 Feb 2025 07:24:54 -0600 Subject: [PATCH 2/4] misc: Use shortened copyright string in About dialog --- ares/ares/ares.cpp.in | 2 +- cmake/common/bootstrap.cmake | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ares/ares/ares.cpp.in b/ares/ares/ares.cpp.in index 918cc8db6..6a99b061f 100644 --- a/ares/ares/ares.cpp.in +++ b/ares/ares/ares.cpp.in @@ -11,7 +11,7 @@ bool _runAhead = false; const string Name = "@ARES_NAME@"; const string Version = "@ARES_VERSION@"; -const string Copyright = "@ARES_LEGAL_COPYRIGHT@"; +const string Copyright = "@ARES_LEGAL_COPYRIGHT_SHORT@"; const string License = "ISC"; const string LicenseURI = "https://opensource.org/licenses/ISC"; const string Website = "@ARES_WEBSITE@"; diff --git a/cmake/common/bootstrap.cmake b/cmake/common/bootstrap.cmake index 15b93df9a..846560168 100644 --- a/cmake/common/bootstrap.cmake +++ b/cmake/common/bootstrap.cmake @@ -25,6 +25,7 @@ set( ) string(TIMESTAMP CURRENT_YEAR "%Y") set(ARES_LEGAL_COPYRIGHT "Copyright (c) 2004-${CURRENT_YEAR} ares team, Near et. al.") +set(ARES_LEGAL_COPYRIGHT_SHORT "2004-${CURRENT_YEAR} ares team, Near") # Add common module directories to default search path list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/common" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finders") From 271cd5bad6875430e5ab2c60d45eab37b06c44ba Mon Sep 17 00:00:00 2001 From: jcm <6864788+jcm93@users.noreply.github.com> Date: Mon, 10 Feb 2025 07:25:40 -0600 Subject: [PATCH 3/4] build: Add legacy zconf header to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index e2887fd5c..b3f99153a 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ mia/resource/resource.cpp mia/resource/resource.hpp tests/arm7tdmi/tests tests/m68000/tests +thirdparty/libchdr/deps/zlib-*/zconf.h +thirdparty/libchdr/deps/zlib-*/zconf.h.included From e195b79dd1da58e2917f9ca25e329ef751bec3a4 Mon Sep 17 00:00:00 2001 From: jcm <6864788+jcm93@users.noreply.github.com> Date: Mon, 10 Feb 2025 07:27:19 -0600 Subject: [PATCH 4/4] build: Adjust CI push workflow to properly run on all branches --- .github/workflows/build.yml | 2 +- .github/workflows/push.yml | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 041372d45..e8d3f12ca 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -80,7 +80,7 @@ jobs: - name: "macOS: Import Certificate" if: runner.os == 'macOS' && inputs.codesign uses: apple-actions/import-codesign-certs@v3 - continue-on-error: ${{ !inputs.codesign }} + continue-on-error: ${{ secrets.MACOS_CERTIFICATE_NAME == '' }} with: p12-file-base64: ${{ secrets.MACOS_CERTIFICATE_DATA }} p12-password: ${{ secrets.MACOS_CERTIFICATE_PASSPHRASE }} diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 7dbbc0764..ce675cb87 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -1,8 +1,6 @@ name: Push on: - push: - branches: [ '*' ] - tags: [ 'v*' ] + push concurrency: group: '${{ github.workflow }} @ ${{ github.head_ref || github.ref }}' cancel-in-progress: true