From 7ebabe5548aa6f0b12024be38813557d8f8b2288 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 9 Jul 2024 11:26:15 +0800 Subject: [PATCH 1/4] CI: Upgrade GitHub Actions imports in clang-format.yml --- .github/workflows/clang-format.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/clang-format.yml b/.github/workflows/clang-format.yml index e71d432445..da037e263c 100644 --- a/.github/workflows/clang-format.yml +++ b/.github/workflows/clang-format.yml @@ -56,9 +56,9 @@ jobs: - check: "win32/compat" exclude: "" steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Run clang-format style check for C/C++ programs. - uses: jidicula/clang-format-action@v4.4.1 + uses: jidicula/clang-format-action@v4.13.0 with: clang-format-version: "16" check-path: ${{ matrix.path['check'] }} From acdacd4fefbddff2ae3f5bf1d044fac1d3077ef5 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 11 Jul 2024 15:51:41 +0800 Subject: [PATCH 2/4] clamonacc/inotif/inotif.c: format code --- clamonacc/inotif/inotif.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/clamonacc/inotif/inotif.c b/clamonacc/inotif/inotif.c index 74654b19a0..9795db4fb2 100644 --- a/clamonacc/inotif/inotif.c +++ b/clamonacc/inotif/inotif.c @@ -154,7 +154,7 @@ int onas_ddd_init(uint64_t nwatches, size_t ht_size) if (ret < 0) return CL_EREAD; tmp = strtol(nwatch_str, &p, 10); - if (tmp < 0 || tmp == LONG_MAX){ + if (tmp < 0 || tmp == LONG_MAX) { /*Seems like a sane value (also the value on my ubuntu system)*/ nwatches = 0x10000; } else { From f65b95edeb956f656203d9c5b426281ed25e8841 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Thu, 11 Jul 2024 13:34:06 +0800 Subject: [PATCH 3/4] cmake/FindRust.cmake: strip MSVC linker flags ... ... from native libraries array. Otherwise Ninja will get very confused. --- cmake/FindRust.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/cmake/FindRust.cmake b/cmake/FindRust.cmake index ffa86e33f1..227d0b4552 100644 --- a/cmake/FindRust.cmake +++ b/cmake/FindRust.cmake @@ -430,6 +430,8 @@ foreach(LINE ${LINE_LIST}) string(REPLACE "native-static-libs: " "" LINE "${LINE}") string(REGEX REPLACE " " "" LINE "${LINE}") string(REGEX REPLACE " " ";" LINE "${LINE}") + # remove linker flags + list(FILTER LINE EXCLUDE REGEX "/.*") if(LINE) message(STATUS "Rust's native static libs: ${LINE}") From af39b28b260869dcbcafcab750f3a3a9eff144a8 Mon Sep 17 00:00:00 2001 From: liushuyu Date: Tue, 9 Jul 2024 12:01:24 +0800 Subject: [PATCH 4/4] CI: update various GitHub Actions imports in cmake.yml --- .github/workflows/cmake.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 7b2711fbb5..4b45d7e9eb 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -29,17 +29,17 @@ jobs: run: rm /usr/bin/link.exe shell: bash - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install Build Tools - uses: crazy-max/ghaction-chocolatey@v1 + uses: crazy-max/ghaction-chocolatey@v3 with: args: install wixtoolset - name: Install pytest for easier to read test results run: python3 -m pip install pytest - - uses: lukka/get-cmake@v3.21.2 + - uses: lukka/get-cmake@v3.30.0 # Restore from cache the previously built ports. If cache-miss, download, build vcpkg ports. - name: Restore vcpkg ports from cache or install vcpkg @@ -91,7 +91,7 @@ jobs: runs-on: macos-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Install Build Tools run: brew install bison flex pipx @@ -102,7 +102,7 @@ jobs: - name: Install pytest for easier to read test results run: pipx install pytest - - uses: lukka/get-cmake@v3.21.2 + - uses: lukka/get-cmake@v3.30.0 - name: Create Build Directory shell: bash @@ -142,7 +142,7 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 + - uses: actions/checkout@v4 - name: Update package listings run: sudo apt-get update @@ -156,7 +156,7 @@ jobs: - name: Install pytest for easier to read test results run: pipx install pytest - - uses: lukka/get-cmake@v3.21.2 + - uses: lukka/get-cmake@v3.30.0 - name: Create Build Directory shell: bash