From 1f2e5065a0bfa8370836137ea28d2519ead22887 Mon Sep 17 00:00:00 2001 From: Thomas Roos Date: Thu, 19 Dec 2024 14:45:58 +0100 Subject: [PATCH] fmt --- .github/workflows/packaging.yml | 18 +++++++++++++----- .github/workflows/static-packaging.yml | 4 +++- CMakeLists.txt | 9 ++++++--- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index 967dbad83..b47672a10 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -25,7 +25,9 @@ jobs: path: | ~/podman-aarch64-linux-gnu-image.tar ~/podman-x86-64-image.tar - key: ${{ runner.os }}-${{ matrix.architecture }}-podman-${{ hashFiles('misc/buildtestcontainer/*') }} + key: + ${{ runner.os }}-${{ matrix.architecture }}-podman-${{ + hashFiles('misc/buildtestcontainer/*') }} - name: Build and save container for aarch64-linux-gnu if: matrix.architecture == 'aarch64-linux-gnu' @@ -85,12 +87,15 @@ jobs: - name: Save package uses: actions/upload-artifact@v4 with: - name: aws-greengrass-lite-ubuntu-${{ matrix.architecture || 'x86-64'}}_${{ matrix.build_type }} + name: + aws-greengrass-lite-ubuntu-${{ matrix.architecture || 'x86-64'}}_${{ + matrix.build_type }} path: | ${{ github.workspace }}/zipfile/* retention-days: 1 - - name: Save x86-64 package without build type - default package to download + - name: + Save x86-64 package without build type - default package to download if: matrix.build_type == 'MinSizeRel' && matrix.architecture == '' uses: actions/upload-artifact@v4 with: @@ -99,8 +104,11 @@ jobs: ${{ github.workspace }}/zipfile/* retention-days: 1 - - name: Save arm64 package without build type - default package to download - if: matrix.build_type == 'MinSizeRel' && matrix.architecture == 'aarch64-linux-gnu' + - name: + Save arm64 package without build type - default package to download + if: + matrix.build_type == 'MinSizeRel' && matrix.architecture == + 'aarch64-linux-gnu' uses: actions/upload-artifact@v4 with: name: aws-greengrass-lite-ubuntu-arm64 diff --git a/.github/workflows/static-packaging.yml b/.github/workflows/static-packaging.yml index 122433d63..d9c3bf44c 100644 --- a/.github/workflows/static-packaging.yml +++ b/.github/workflows/static-packaging.yml @@ -24,7 +24,9 @@ jobs: uses: actions/cache@v4 with: path: ~/podman-image.tar - key: ${{ runner.os }}-${{ matrix.architecture }}-podman-${{ hashFiles('misc/staticbuildtestcontainer/*') }} + key: + ${{ runner.os }}-${{ matrix.architecture }}-podman-${{ + hashFiles('misc/staticbuildtestcontainer/*') }} - name: Build and save container for aarch64-linux-gnu if: matrix.architecture == 'aarch64-linux-gnu' diff --git a/CMakeLists.txt b/CMakeLists.txt index 51fdf49eb..b4aefcaa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -428,9 +428,12 @@ string(STRIP "${VERSION_STRING}" VERSION_STRING) set(CPACK_PACKAGE_VERSION "${VERSION_STRING}") -string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" CPACK_PACKAGE_VERSION_MAJOR "${VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" CPACK_PACKAGE_VERSION_MINOR "${VERSION_STRING}") -string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" CPACK_PACKAGE_VERSION_PATCH "${VERSION_STRING}") +string(REGEX REPLACE "^([0-9]+)\\.[0-9]+\\.[0-9]+$" "\\1" + CPACK_PACKAGE_VERSION_MAJOR "${VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.([0-9]+)\\.[0-9]+$" "\\1" + CPACK_PACKAGE_VERSION_MINOR "${VERSION_STRING}") +string(REGEX REPLACE "^[0-9]+\\.[0-9]+\\.([0-9]+)$" "\\1" + CPACK_PACKAGE_VERSION_PATCH "${VERSION_STRING}") set(CPACK_GENERATOR DEB)