From c4439f7d10f00e1b504682eb8be223abc57c277a Mon Sep 17 00:00:00 2001 From: Awawa <69086569+awawa-dev@users.noreply.github.com> Date: Sun, 9 Feb 2025 19:37:31 +0100 Subject: [PATCH] Fix armv6l packages naming 3 --- .github/workflows/push-master.yml | 2 +- .github/workflows/upload-to-github-pages.yml | 2 +- CMakeLists.txt | 3 +++ cmake/packages.cmake | 3 --- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index f49313d93..6007f64ac 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -82,7 +82,7 @@ jobs: - name: Wake-up docker if: matrix.runner == 'ubuntu-24.04-arm' run: | - (sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker) + (sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker && sleep 5) # checkout - uses: actions/checkout@v4.2.2 diff --git a/.github/workflows/upload-to-github-pages.yml b/.github/workflows/upload-to-github-pages.yml index 44a64fc78..957bad1ca 100644 --- a/.github/workflows/upload-to-github-pages.yml +++ b/.github/workflows/upload-to-github-pages.yml @@ -79,7 +79,7 @@ jobs: - name: Wake-up docker if: matrix.runner == 'ubuntu-24.04-arm' run: | - (sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker) + (sudo systemctl start docker) || (echo "Retrying docker" && sleep 5 && sudo systemctl start docker && sleep 5) # checkout - uses: actions/checkout@v4.2.2 diff --git a/CMakeLists.txt b/CMakeLists.txt index 7990093a5..b918a8191 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,6 +9,9 @@ message( STATUS "CMake Version: ${CMAKE_VERSION}" ) PROJECT(HyperHdr) +if (OVERRIDE_ARCHITECTURE) + SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}") +endif(OVERRIDE_ARCHITECTURE) set(OUR_CMAKE_MODULES ${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_modules) set(CMAKE_MODULE_PATH ${OUR_CMAKE_MODULES} ${CMAKE_MODULE_PATH}) diff --git a/cmake/packages.cmake b/cmake/packages.cmake index 15d3c6872..dab93146c 100644 --- a/cmake/packages.cmake +++ b/cmake/packages.cmake @@ -56,9 +56,6 @@ endif() SET ( CPACK_PACKAGE_NAME "HyperHDR" ) SET ( CPACK_PACKAGE_DESCRIPTION_SUMMARY "HyperHDR is an open source ambient light implementation" ) SET ( CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README.md" ) -if (OVERRIDE_ARCHITECTURE) - SET ( CMAKE_SYSTEM_PROCESSOR "${OVERRIDE_ARCHITECTURE}") -endif(OVERRIDE_ARCHITECTURE) SET ( CPACK_PACKAGE_FILE_NAME "HyperHDR-${HYPERHDR_VERSION}-${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}") SET ( CPACK_PACKAGE_CONTACT "see_me_at@hyperhdr.eu")