Skip to content

Commit b684c75

Browse files
authored
Merge branch 'main' into patch-5
2 parents 509436c + 42dc02b commit b684c75

2 files changed

Lines changed: 12 additions & 16 deletions

File tree

.github/workflows/build.yml

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
jobs:
1616
Docker:
1717
name: "Check whether docker setup, build, test work correctly."
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-24.04
1919
steps:
2020
- uses: actions/checkout@v3
2121
- name: Docker Setup
@@ -27,7 +27,7 @@ jobs:
2727
name: Doxygenize
2828
#Only run for push to main
2929
if: github.ref == 'refs/heads/main'
30-
runs-on: ubuntu-latest
30+
runs-on: ubuntu-24.04
3131
permissions:
3232
contents: write # Needed to push to gh-pages
3333
steps:
@@ -43,26 +43,22 @@ jobs:
4343
ghpagesbranch: gh-pages
4444
# GitHub Pages directory path
4545
ghpagesdir: ./docs
46-
46+
4747
Formatting:
4848
name: Clang Format
49-
runs-on: ubuntu-latest
50-
strategy:
51-
matrix:
52-
path:
53-
- 'src'
54-
- 'examples'
49+
runs-on: ubuntu-24.04
5550
steps:
56-
- uses: actions/checkout@v3
57-
- name: Run clang-format style check for C/C++/Protobuf programs.
58-
uses: jidicula/clang-format-action@v4.11.0
51+
- uses: actions/checkout@v4
5952
with:
60-
clang-format-version: '20'
61-
check-path: ${{ matrix.path }}
53+
fetch-depth: 0
54+
- name: clang-format style check
55+
run: |
56+
git clang-format-18 --diff -q origin/main | tee format_diff.txt
57+
if [ -s format_diff.txt ]; then exit 1; fi
6258
6359
Linting:
6460
name: Shellcheck
65-
runs-on: ubuntu-latest
61+
runs-on: ubuntu-24.04
6662
steps:
6763
- uses: actions/checkout@v3
6864
- name: Run ShellCheck

src/rmq/rmqamqpt/rmqamqpt_basicproperties.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -343,7 +343,7 @@ bool BasicProperties::decode(BasicProperties* props,
343343
}
344344
if (flags & maskForProperty(USER_ID)) {
345345
properties.userId = "";
346-
if (rmqamqpt::Types::decodeShortString(&*properties.userId, &buffer)) {
346+
if (!rmqamqpt::Types::decodeShortString(&*properties.userId, &buffer)) {
347347
BALL_LOG_ERROR << "Decoding fail for basic property: "
348348
<< PROPERTY_NAMES[USER_ID];
349349
success = false;

0 commit comments

Comments
 (0)