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.

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

build: upgrade os for oss build #18027

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/build-redpanda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,12 @@ on:

jobs:
build:
if: github.event.pull_request.draft == false
name: build redpanda
runs-on: ubuntu-latest-64
timeout-minutes: 30
strategy:
matrix:
os: ["ubuntu:mantic", "fedora:38"]
os: ["ubuntu:noble", "fedora:40"]
container:
image: ${{ matrix.os }}
steps:
Expand Down
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ endif()
# creating a constexpr enum value that is bitwise combination
# of flags can trigger this warning as the resulting "enum",
# isn't a valid value.
add_compile_options(-Wno-enum-constexpr-conversion)
# Currently boost causes some warnings in -Wdeprecated-declarations due to std::aligned_storage,
# these crop up all over, so disable them globally.
add_compile_options(-Wno-enum-constexpr-conversion -Wno-deprecated-declarations)

include(dependencies)
include(v_library)
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ set(Seastar_API_LEVEL 6 CACHE STRING "" FORCE)
set(Seastar_CXX_FLAGS -Wno-error)
fetch_dep(seastar
REPO https://github.com/redpanda-data/seastar.git
TAG v24.1.x
TAG v24.2.x
PATCH_COMMAND sed -i "s/add_subdirectory (tests/# add_subdirectory (tests/g" CMakeLists.txt)

fetch_dep(avro
Expand Down
2 changes: 1 addition & 1 deletion install-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ fedora_deps=(
python3
python3-jinja2
python3-jsonschema
ragel-devel
ragel
re2-devel
rust
snappy-devel
Expand Down
11 changes: 6 additions & 5 deletions src/v/serde/serde_is_enum.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
// the Business Source License, use of this software will be governed
// by the Apache License, Version 2.0

#include <cstdint>
#include <type_traits>

#pragma once
Expand All @@ -17,12 +18,12 @@ using serde_enum_serialized_t = int32_t;

template<typename T>
inline constexpr bool serde_is_enum_v =
#if __has_cpp_attribute(__cpp_lib_is_scoped_enum)
std::is_scoped_enum_v<T>
&& sizeof(std::decay_t<T>) <= sizeof(serde_enum_serialized_t);
#else
// #if __has_cpp_attribute(__cpp_lib_is_scoped_enum)
// std::is_scoped_enum_v<T>
// && sizeof(std::decay_t<T>) <= sizeof(serde_enum_serialized_t);
// #else
std::is_enum_v<T>
&& sizeof(std::decay_t<T>) <= sizeof(serde_enum_serialized_t);
#endif
// #endif

} // namespace serde