From cb60486f277a7feebdce30163d10428aaffa867e Mon Sep 17 00:00:00 2001 From: Renovate Date: Thu, 24 Sep 2026 00:24:59 +0000 Subject: [PATCH 1/6] Update dependency wxWidgets/wxWidgets to v3.3.3.1 --- .github/workflows/cmake.yml | 2 +- CMakeLists.txt | 4 ++-- README.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 459ff998..13e4c620 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -34,7 +34,7 @@ env: APP_WINDOW: "My Window" # NOTE: also update in CMakeLists FetchContent # renovate: datasource=github-tags depName=wxWidgets/wxWidgets versioning=loose - WX_VERSION: "v3.3.1" + WX_VERSION: "v3.3.3.1" defaults: run: diff --git a/CMakeLists.txt b/CMakeLists.txt index 363f5994..7bfa44b5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,9 +35,9 @@ FetchContent_Declare( SYSTEM GIT_REPOSITORY https://github.com/wxWidgets/wxWidgets.git # renovate: datasource=github-tags depName=wxWidgets/wxWidgets versioning=loose - GIT_TAG v3.3.1 + GIT_TAG v3.3.3.1 # renovate: depName=wxWidgets/wxWidgets - # GIT_TAG 1f9535fbb666c6e89820eb36c38c7143f534cb38 # v3.3.1 + # GIT_TAG 565553ee980e925bbd8b3cdaeea0eb9f453d7dfd # v3.3.3.1 GIT_SHALLOW 1 # works only with branches or tags, not with arbitrary commit hashes GIT_PROGRESS ON ) diff --git a/README.md b/README.md index 2cc92bc4..551a0654 100644 --- a/README.md +++ b/README.md @@ -194,5 +194,5 @@ The [template repository](https://github.com/mcmarius/oop-template) itself is li ## Resurse -- [wxWidgets](https://github.com/wxWidgets/wxWidgets/tree/v3.3.1) (wxWindows Library Licence ~ LGPL) +- [wxWidgets](https://github.com/wxWidgets/wxWidgets/tree/v3.3.3.1) (wxWindows Library Licence ~ LGPL) - adăugați trimiteri **detaliate** către resursele externe care v-au ajutat sau pe care le-ați folosit From fdc483a7a573a07de6c41870625a6a694655bade Mon Sep 17 00:00:00 2001 From: mcmarius <23401453+mcmarius@users.noreply.github.com> Date: Thu, 24 Sep 2026 16:36:51 +0300 Subject: [PATCH 2/6] Fix Windows artifact packaging: guard wxWidgets DLL subdir flatten The 'mv vc_x64_dll/* .' / 'mv gcc_x64_dll/* .' steps failed with 'cannot stat' when wxWidgets (v3.3.3.1) no longer produces those subdirs (or leaves them empty): a non-matching glob is passed literally to mv. Guard each move with nullglob + compgen so it only runs when the subdir has files, then removes the now-empty dir. --- .github/actions/process-artifacts/action.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/actions/process-artifacts/action.yml b/.github/actions/process-artifacts/action.yml index 77c6c9f2..73a41c9d 100644 --- a/.github/actions/process-artifacts/action.yml +++ b/.github/actions/process-artifacts/action.yml @@ -69,7 +69,11 @@ runs: "$(which VCRUNTIME140.dll)" \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} # fi - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv vc_x64_dll/* . + # wxWidgets installs its DLLs into a per-compiler subdir under bin/ (e.g. vc_x64_dll). + # Flatten them next to the executable. Guard the move: the subdir may be missing or + # empty depending on the wxWidgets version (the layout changed after v3.3.1), and an + # unguarded `mv dir/* .` fails with "cannot stat" when the glob matches nothing. + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && shopt -s nullglob && if compgen -G "vc_x64_dll/*" > /dev/null; then mv -f vc_x64_dll/* . ; fi && rmdir vc_x64_dll 2>/dev/null || true - name: Copy stdlib (MinGW) shell: bash @@ -80,4 +84,5 @@ runs: gcc/mingw64/bin/libgcc_s_seh-1.dll \ gcc/mingw64/bin/libwinpthread-1.dll \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv gcc_x64_dll/* . + # See the MSVC step above for why the move is guarded. + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && shopt -s nullglob && if compgen -G "gcc_x64_dll/*" > /dev/null; then mv -f gcc_x64_dll/* . ; fi && rmdir gcc_x64_dll 2>/dev/null || true From 1b85c4e0bd2c968a797cb8a262d8d1eec716a3db Mon Sep 17 00:00:00 2001 From: mcmarius <23401453+mcmarius@users.noreply.github.com> Date: Fri, 2 Oct 2026 01:24:07 +0200 Subject: [PATCH 3/6] Revert "Fix Windows artifact packaging: guard wxWidgets DLL subdir flatten" This reverts commit fdc483a7a573a07de6c41870625a6a694655bade. --- .github/actions/process-artifacts/action.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/actions/process-artifacts/action.yml b/.github/actions/process-artifacts/action.yml index 73a41c9d..77c6c9f2 100644 --- a/.github/actions/process-artifacts/action.yml +++ b/.github/actions/process-artifacts/action.yml @@ -69,11 +69,7 @@ runs: "$(which VCRUNTIME140.dll)" \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} # fi - # wxWidgets installs its DLLs into a per-compiler subdir under bin/ (e.g. vc_x64_dll). - # Flatten them next to the executable. Guard the move: the subdir may be missing or - # empty depending on the wxWidgets version (the layout changed after v3.3.1), and an - # unguarded `mv dir/* .` fails with "cannot stat" when the glob matches nothing. - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && shopt -s nullglob && if compgen -G "vc_x64_dll/*" > /dev/null; then mv -f vc_x64_dll/* . ; fi && rmdir vc_x64_dll 2>/dev/null || true + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv vc_x64_dll/* . - name: Copy stdlib (MinGW) shell: bash @@ -84,5 +80,4 @@ runs: gcc/mingw64/bin/libgcc_s_seh-1.dll \ gcc/mingw64/bin/libwinpthread-1.dll \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} - # See the MSVC step above for why the move is guarded. - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && shopt -s nullglob && if compgen -G "gcc_x64_dll/*" > /dev/null; then mv -f gcc_x64_dll/* . ; fi && rmdir gcc_x64_dll 2>/dev/null || true + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv gcc_x64_dll/* . From ec64c97767d9ced46f8cda746b0a71182176f589 Mon Sep 17 00:00:00 2001 From: mcmarius <23401453+mcmarius@users.noreply.github.com> Date: Fri, 2 Oct 2026 01:53:49 +0200 Subject: [PATCH 4/6] DLLs were moved from bin/ to lib/ And no longer copied on cmake install to our bin dir --- .github/actions/process-artifacts/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/actions/process-artifacts/action.yml b/.github/actions/process-artifacts/action.yml index 77c6c9f2..062ef56f 100644 --- a/.github/actions/process-artifacts/action.yml +++ b/.github/actions/process-artifacts/action.yml @@ -69,7 +69,7 @@ runs: "$(which VCRUNTIME140.dll)" \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} # fi - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv vc_x64_dll/* . + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll/*.dll . - name: Copy stdlib (MinGW) shell: bash @@ -80,4 +80,4 @@ runs: gcc/mingw64/bin/libgcc_s_seh-1.dll \ gcc/mingw64/bin/libwinpthread-1.dll \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv gcc_x64_dll/* . + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll/*.dll . From 1cd81b8fda865a047dc319ebbad1e755f8ab9a83 Mon Sep 17 00:00:00 2001 From: mcmarius <23401453+mcmarius@users.noreply.github.com> Date: Fri, 2 Oct 2026 13:26:22 +0200 Subject: [PATCH 5/6] List files, no-op to recreate cache --- .github/actions/process-artifacts/action.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/actions/process-artifacts/action.yml b/.github/actions/process-artifacts/action.yml index 062ef56f..a072c2f8 100644 --- a/.github/actions/process-artifacts/action.yml +++ b/.github/actions/process-artifacts/action.yml @@ -69,7 +69,11 @@ runs: "$(which VCRUNTIME140.dll)" \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} # fi - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll/*.dll . + # cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll/*.dll . + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll/*.dll || true) - name: Copy stdlib (MinGW) shell: bash @@ -80,4 +84,8 @@ runs: gcc/mingw64/bin/libgcc_s_seh-1.dll \ gcc/mingw64/bin/libwinpthread-1.dll \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll/*.dll . + # cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll/*.dll . + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll/*.dll || true) From 764d1658fe3d879b51beb611f67f4acfc88f71f3 Mon Sep 17 00:00:00 2001 From: mcmarius <23401453+mcmarius@users.noreply.github.com> Date: Fri, 2 Oct 2026 22:07:21 +0200 Subject: [PATCH 6/6] Fix copying dlls --- .github/actions/process-artifacts/action.yml | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/.github/actions/process-artifacts/action.yml b/.github/actions/process-artifacts/action.yml index a072c2f8..39121775 100644 --- a/.github/actions/process-artifacts/action.yml +++ b/.github/actions/process-artifacts/action.yml @@ -69,11 +69,8 @@ runs: "$(which VCRUNTIME140.dll)" \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} # fi - # cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll/*.dll . - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts || true) - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib || true) - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll || true) - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/vc_x64_dll/*.dll || true) + # glob relative to cd to avoid mixed slashes paths which interact badly with glob + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ../artifacts/lib/vc_x64_dll/*.dll . - name: Copy stdlib (MinGW) shell: bash @@ -84,8 +81,4 @@ runs: gcc/mingw64/bin/libgcc_s_seh-1.dll \ gcc/mingw64/bin/libwinpthread-1.dll \ ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} - # cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll/*.dll . - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts || true) - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib || true) - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll || true) - cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && (ls -la ${GITHUB_WORKSPACE}/artifacts/lib/gcc_x64_dll/*.dll || true) + cd ${GITHUB_WORKSPACE}/${{ env.ZIP_NAME }} && mv ../artifacts/lib/gcc_x64_dll/*.dll .