Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: Fix recent CI failures #1307

Merged
merged 4 commits into from
Jul 22, 2024
+12 −10
Merged

CI: Fix recent CI failures #1307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7ebabe5
CI: Upgrade GitHub Actions imports in clang-format.yml
liushuyu Jul 9, 2024
acdacd4
clamonacc/inotif/inotif.c: format code
liushuyu Jul 11, 2024
f65b95e
cmake/FindRust.cmake: strip MSVC linker flags ...
liushuyu Jul 11, 2024
af39b28
CI: update various GitHub Actions imports in cmake.yml
liushuyu Jul 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/clang-format.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'] }}
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion clamonacc/inotif/inotif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 2 additions & 0 deletions cmake/FindRust.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "/.*")
micahsnyder marked this conversation as resolved.
Show resolved Hide resolved

if(LINE)
message(STATUS "Rust's native static libs: ${LINE}")
Expand Down
Loading