chore(ci): various fixes

EmixamPP · Aug 4, 2024 · 6cabed1 · 6cabed1
1 parent 44d4edd
commit 6cabed1
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,12 +5,12 @@ on:
     inputs:
       buildtype:
         type: string
-        default: minsize
+        default: release
   workflow_call:
     inputs:
       buildtype:
         type: string
-        default: minsize
+        default: release
 
 jobs:
   build:
@@ -30,7 +30,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .github/workflows/deps/install_dir
-          key: ${{ hashFiles('.github/deps/CMakeLists.txt') }}
+          key: ${{ hashFiles('.github/workflows/deps/CMakeLists.txt') }}
 
       - name: Build lib dependencis
         if: ${{ steps.deps-cache.outputs.cache-hit != 'true' }}
@@ -43,10 +43,8 @@ jobs:
         run: |
           meson setup build --libdir=lib --prefer-static --pkg-config-path=$(find .github -name "pkgconfig")
           case "${{ inputs.buildtype }}" in
-            "minsize")
-              meson configure build --optimization=s
             "release")
-              meson configure build --strip
+              meson configure build --optimization=s --strip
               ;;
             "debug")
               meson configure build --buildtype=debug

diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml
@@ -21,8 +21,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .github/workflows/deps/install_dir
-          key: ${{ hashFiles('.github/deps/CMakeLists.txt') }}
-          fail-on-cache-miss: true
+          key: ${{ hashFiles('.github/workflows/deps/CMakeLists.txt') }}
 
       - name: Setup
         run: |

diff --git a/.github/workflows/clang-tidy.yml b/.github/workflows/clang-tidy.yml
@@ -21,8 +21,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: .github/workflows/deps/install_dir
-          key: ${{ hashFiles('.github/deps/CMakeLists.txt') }}
-          fail-on-cache-miss: true
+          key: ${{ hashFiles('.github/workflows/deps/CMakeLists.txt') }}
 
       - name: Setup
         run: |

diff --git a/.github/workflows/depend-argparse.yml b/.github/workflows/depend-argparse.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Modify file if new version
         run: |
-            sed -i 's/\(option(ARGPARSE_GIT_TAG "[^\"]*" "\)[^"]*"/\1'"${VERSION}"'"/' .github/workflows/deps/CMakeLists.txt
+            sed -i 's/\(set(ARGPARSE_GIT_TAG "\)[^"]*\(".*\)/\1${{ env.VERSION }}\2/' .github/workflows/deps/CMakeLists.txt
 
       - name: Create PR if new version
         uses: peter-evans/create-pull-request@v6

diff --git a/.github/workflows/depend-opencv.yml b/.github/workflows/depend-opencv.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Modify file if new version
         run: |
-            sed -i 's/\(option(OPENCV_GIT_TAG "[^\"]*" "\)[^"]*"/\1'"${VERSION}"'"/' .github/workflows/deps/CMakeLists.txt
+            sed -i 's/\(set(OPENCV_GIT_TAG "\)[^"]*\(".*\)/\1${{ env.VERSION }}\2/' .github/workflows/deps/CMakeLists.txt
 
       - name: Create PR if new version
         uses: peter-evans/create-pull-request@v6

diff --git a/.github/workflows/depend-spdlog.yml b/.github/workflows/depend-spdlog.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Modify file if new version
         run: |
-            sed -i 's/\(option(SPDLOG_GIT_TAG "[^\"]*" "\)[^"]*"/\1'"${VERSION}"'"/' .github/workflows/deps/CMakeLists.txt
+            sed -i 's/\(set(SPDLOG_GIT_TAG "\)[^"]*\(".*\)/\1${{ env.VERSION }}\2/' .github/workflows/deps/CMakeLists.txt
 
       - name: Create PR if new version
         uses: peter-evans/create-pull-request@v6

diff --git a/.github/workflows/depend-yaml.yml b/.github/workflows/depend-yaml.yml
@@ -21,7 +21,7 @@ jobs:
 
       - name: Modify file if new version
         run: |
-            sed -i 's/\(option(YAML_GIT_TAG "[^\"]*" "\)[^"]*"/\1'"${VERSION}"'"/' .github/workflows/deps/CMakeLists.txt
+            sed -i 's/\(set(YAML_GIT_TAG "\)[^"]*\(".*\)/\1${{ env.VERSION }}\2/' .github/workflows/deps/CMakeLists.txt
 
       - name: Create PR if new version
         uses: peter-evans/create-pull-request@v6

diff --git a/.github/workflows/deps/CMakeLists.txt b/.github/workflows/deps/CMakeLists.txt
@@ -5,10 +5,10 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
     set(CMAKE_INSTALL_PREFIX "${PROJECT_SOURCE_DIR}/install_dir" CACHE PATH "Default install prefix" FORCE)
 endif()
 
-option(OPENCV_GIT_TAG "Tag or branch used to checkout when cloning opencv" "4.9.0")
-option(YAML_GIT_TAG "Tag or branch used to checkout when cloning yaml-cpp" "0.8.0")
-option(ARGPARSE_GIT_TAG "Tag or branch used to checkout when cloning argparse" "v3.0")
-option(SPDLOG_GIT_TAG "Tag or branch used to checkout when cloning argparse" "v1.14.1")
+set(OPENCV_GIT_TAG "4.9.0" CACHE STRING "Tag or branch used to checkout when cloning opencv")
+set(YAML_GIT_TAG "0.8.0" CACHE STRING "Tag or branch used to checkout when cloning yaml-cpp")
+set(ARGPARSE_GIT_TAG "v3.1" CACHE STRING "Tag or branch used to checkout when cloning argparse")
+set(SPDLOG_GIT_TAG "v1.14.1" CACHE STRING "Tag or branch used to checkout when cloning argparse")
 
 include(ExternalProject)
 

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -37,12 +37,12 @@ jobs:
 
             ## :clipboard: [Logs](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
+            ## :hammer_and_wrench: Building result: ${{ needs.build.result == 'success' && ':white_check_mark:' || ':x:' }}
+
             ## :mag: clang-tidy results: ${{ (needs.clang-tidy.result == 'success' && ':white_check_mark:') || (needs.clang-tidy.result == 'skipped' && ':no_entry_sign:') || ':x:' }}
 
             ## :writing_hand: clang-format results: ${{ (needs.clang-format.result == 'success' && ':white_check_mark:') || (needs.clang-format.result == 'skipped' && ':no_entry_sign:') || ':x:' }}
 
-            ## :hammer_and_wrench: Building result: ${{ needs.build.result == 'success' && ':white_check_mark:' || ':x:' }}
-
             ## :package: Artifacts:
             If the building step was successfull:
             1. Download the tarball in the artifacts section [here](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}).

diff --git a/meson.build b/meson.build
@@ -5,6 +5,7 @@ project(
     license: 'MIT',
     default_options: [
         'cpp_std=c++17',
+        'buildtype=release',
         'warning_level=everything',
         'werror=true',
     ],

diff --git a/src/linux-enable-ir-emitter.cpp.in b/src/linux-enable-ir-emitter.cpp.in
@@ -36,7 +36,7 @@ static void check_root() noexcept
  */
 static void setup_logger(bool verbose_console, bool enable_file)
 {
-    auto console_sink = make_shared<spdlog::sinks::stdout_color_sink_mt>();
+    auto console_sink = make_shared<spdlog::sinks::stdout_color_sink_st>();
     console_sink->set_level(verbose_console ? spdlog::level::debug : spdlog::level::info);
     console_sink->set_pattern("%v");
 
@@ -46,7 +46,7 @@ static void setup_logger(bool verbose_console, bool enable_file)
     {
         try
         {
-            auto file_sink = make_shared<spdlog::sinks::daily_file_format_sink_mt>(LOG_FILE, 0, 0);
+            auto file_sink = make_shared<spdlog::sinks::daily_file_format_sink_st>(LOG_FILE, 0, 0);
             file_sink->set_level(spdlog::level::debug);
             file_sink->set_pattern("[%H:%M:%S] [%l] %v");