Skip to content

Commit

Permalink
Merge 'github: s/clang++-18/clang++/' from Kefu Chai
Browse files Browse the repository at this point in the history
in 28b0555, we switched from ubuntu:jammy to fedora:40 as the building environment of our CI workflow. and we replaced the input parameter "clang++-18" in test.yml with "clang++", because in fedora:40, the clang++ executable does not have the postfix as the clang-18 installed by the setup-cpp action.

but we failed to update all of them in that change, that's why the "check header" step was not performed after that change.

in this change, we replace that last "clang++-18" in the workflow to "clang++".

Closes #2267

* https://github.com/scylladb/seastar:
  github: s/clang++-18/clang++/
  include: include used headers
  • Loading branch information
xemul committed May 25, 2024
2 parents f583e21 + 245ec8f commit 5cd5383
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ jobs:
run: cmake --build build/${{inputs.mode}}

- name: Check Header
if: ${{ inputs.mode == 'dev' && inputs.compiler == 'clang++-18' }}
if: ${{ inputs.mode == 'dev' && inputs.compiler == 'clang++' }}
run: cmake --build build/${{ inputs.mode }} --target checkheaders

- name: Build with C++20 modules
Expand Down
2 changes: 1 addition & 1 deletion include/seastar/testing/exchanger.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

#include <mutex>
#include <condition_variable>
#include <seastar/util/std-compat.hh>
#include <optional>

namespace seastar {

Expand Down

0 comments on commit 5cd5383

Please sign in to comment.