Skip to content

Commit

Permalink
Update clang-format to LLVM 18 (#9729)
Browse files Browse the repository at this point in the history
Update from Ubuntu 22.04 to Ubuntu 24.04, and update the version of
clang used accordingly.
  • Loading branch information
alexcrichton authored Dec 4, 2024
1 parent da7c53b commit 94da012
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ jobs:
# Note that `wasmtime-platform.h` is excluded here as it's auto-generated.
clangformat:
name: Clang format
runs-on: ubuntu-22.04 # FIXME: fails on `ubuntu-24.04` right now
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v4
with:
Expand All @@ -89,7 +89,7 @@ jobs:
git ls-files '*.h' '*.c' '*.cpp' | \
grep -v wasmtime-platform.h | \
grep -v wasm.h | \
xargs clang-format-15 --dry-run --Werror --verbose
xargs clang-format-18 --dry-run --Werror --verbose
# common logic to cancel the entire run if this job fails
- run: gh run cancel ${{ github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion crates/wasmtime/src/runtime/vm/helpers.c
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ __declspec(dllexport)
// important.
__attribute__((weak))
#endif
struct JITDescriptor __jit_debug_descriptor = {1, 0, NULL, NULL};
struct JITDescriptor __jit_debug_descriptor = {1, 0, NULL, NULL};

struct JITDescriptor *VERSIONED_SYMBOL(wasmtime_jit_debug_descriptor)() {
return &__jit_debug_descriptor;
Expand Down

0 comments on commit 94da012

Please sign in to comment.