From bacf41b48f7d8a8b60bf90bfc11d5eac8294a91e Mon Sep 17 00:00:00 2001 From: PawelKorsak Date: Tue, 4 Feb 2025 13:32:14 +0100 Subject: [PATCH 1/4] fix: build artifact version bump --- .github/workflows/build.yaml | 2 +- CMakeLists.txt | 2 +- candle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 9868570..a6786bb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,7 +14,7 @@ jobs: container: image: klonyyy/armnoneeabi:2 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: submodules: recursive # token: ${{ secrets.PAT }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3a8eb39..1face59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.5) set(CMAKE_CXX_STANDARD 14) -set(MDTOOL_VERSION 1.5.2) +set(MDTOOL_VERSION 1.5.3) set(MDTOOL_VERSION_TAG 'r') diff --git a/candle b/candle index c79d365..53facd8 160000 --- a/candle +++ b/candle @@ -1 +1 @@ -Subproject commit c79d3654a0e4369960f53520213df64869f6533c +Subproject commit 53facd86e8d55f0a08d85bf4723689f7cd71f997 From c28efe267d04de5a5c5ebe0265f64d3ff558c984 Mon Sep 17 00:00:00 2001 From: PawelKorsak Date: Tue, 4 Feb 2025 13:35:50 +0100 Subject: [PATCH 2/4] fix: glibc linked statically --- CMakeLists.txt | 2 +- candle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1face59..91d8d26 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -39,7 +39,7 @@ add_subdirectory(candle) set(CMAKE_BUILD_TYPE Release) add_executable(${PROJECT_NAME} ${SRC}) -target_link_libraries(${PROJECT_NAME} candle) +target_link_libraries(${PROJECT_NAME} candle -static-libgcc -static-libstdc++) target_include_directories(${PROJECT_NAME} PUBLIC ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/candle/include ${CMAKE_SOURCE_DIR}/3rd_party/mINI/src) set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME "mdtool") diff --git a/candle b/candle index 53facd8..e8b4c00 160000 --- a/candle +++ b/candle @@ -1 +1 @@ -Subproject commit 53facd86e8d55f0a08d85bf4723689f7cd71f997 +Subproject commit e8b4c005e00424f4353501cec90fc977305119dd From ff7313429063d77c3a5c7078a00271f1e7097ee3 Mon Sep 17 00:00:00 2001 From: PawelKorsak Date: Tue, 4 Feb 2025 13:41:27 +0100 Subject: [PATCH 3/4] fix: artifacts version bump --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a6786bb..a72f3ed 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -21,7 +21,7 @@ jobs: - name: build_step shell: bash run: ./release.sh - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: name: MDtool path: build/packages/* From d8bd60dfe6423ebb3bd31727f62a062e0a666f2b Mon Sep 17 00:00:00 2001 From: PawelKorsak Date: Wed, 5 Feb 2025 10:50:56 +0100 Subject: [PATCH 4/4] candle version bump --- candle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/candle b/candle index e8b4c00..a93f305 160000 --- a/candle +++ b/candle @@ -1 +1 @@ -Subproject commit e8b4c005e00424f4353501cec90fc977305119dd +Subproject commit a93f3054f819e208596e36789ecb56ee481812ed