Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ trim_trailing_whitespace = true
indent_style = space
indent_size = 2

[*.{yml,yaml}]
[*.{yml,yaml,gen}]
indent_style = space
indent_size = 2

Expand All @@ -25,5 +25,3 @@ indent_size = 4

[{Makefile,*.mk}]
indent_style = tab


76 changes: 46 additions & 30 deletions .github/workflows/cmake-build-ci.gen
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ echo "# Generated file; do not edit!\n";
const DEF = [
"os" => "Linux",

"Linux" => "ubuntu-22.04", "ubuntu-22.04" => "gnu",
"Linux" => "ubuntu-24.04", "ubuntu-24.04" => "gnu",
"Windows" => "windows-2022", "windows-2022" => "msvc",
"macOS" => "macos-12", "macos-12" => "clang",
"macOS" => "macos-13", "macos-13" => "clang",

"gnu" => [
"CC" => "gcc",
Expand Down Expand Up @@ -39,25 +39,26 @@ const MAP = [
],
"clang" => [
'env.CC_VER' => [
"new" => "-14",
"cur" => "-13",
"new" => "-15",
"cur" => "-14",
"old" => "-13",
]
]
]
],
"ubuntu-20.04" => [
"ubuntu-24.04" => [
'env.CC_VND' => [
"gnu" => [
'env.CC_VER' => [
"new" => "-10",
"cur" => "-9",
"new" => "-14",
"cur" => "-13",
]
],
"clang" => [
'env.CC_VER' => [
"new" => "-12",
"cur" => "-11",
"old" => "-10"
"new" => "-18",
"cur" => "-17",
"old" => "-16"
]
]
]
Expand All @@ -80,11 +81,11 @@ const MAP = [
]
]
],
"windows-2019" => [
"windows-2025" => [
'env.CC_VND' => [
"msvc" => [
"env.CC_VER" => [
"cur" => " 16 2019"
"cur" => " 17 2022"
]
],
"mingw" => [
Expand All @@ -103,27 +104,31 @@ const ENV = [
"clang" => [
"new" => [
"CXXFLAGS" => "-stdlib=libc++",
"INSTALL_CXX" => "libc++-14-dev libc++abi-14-dev"
"INSTALL_CXX" => "libc++-15-dev libc++abi-15-dev"
],
"cur" => [
"CXXFLAGS" => "-stdlib=libc++",
"INSTALL_CXX" => "libc++-14-dev libc++abi-14-dev"
],
"old" => [
"CXXFLAGS" => "-stdlib=libc++",
"INSTALL_CXX" => "libc++-13-dev libc++abi-13-dev"
],
]
],
"ubuntu-20.04" => [
"ubuntu-24.04" => [
"clang" => [
"new" => [
"CXXFLAGS" => "-stdlib=libc++",
"INSTALL_CXX" => "libc++-12-dev libc++abi-12-dev"
"INSTALL_CXX" => "libc++-18-dev libc++abi-18-dev"
],
"cur" => [
"CXXFLAGS" => "-stdlib=libc++",
"INSTALL_CXX" => "libc++-11-dev libc++abi-11-dev"
"INSTALL_CXX" => "libc++-17-dev libc++abi-17-dev"
],
"old" => [
"CXXFLAGS" => "-stdlib=libc++",
"INSTALL_CXX" => "libc++-10-dev libc++abi-10-dev"
"INSTALL_CXX" => "libc++-16-dev libc++abi-16-dev"
],
]
],
Expand Down Expand Up @@ -221,7 +226,7 @@ function steps_getdeps($os_vnd) {
if ($os_vnd === "macOS") :
?>
run: |
brew install bison flex libevent pkg-config sphinx-doc ${INSTALL_MEMCACHED}
brew install bison flex libevent pkg-config rsync sphinx-doc ${INSTALL_MEMCACHED}
brew services stop memcached || true
echo MEMCACHED_BINARY="/usr/local/bin/memcached" >> ${GITHUB_ENV}
<?php
Expand All @@ -237,6 +242,8 @@ function steps_getdeps($os_vnd) {
flex
rsync
openssh
pacboy: >-
nsis:p
<?php
endif;
if ($os_vnd != "Windows") :
Expand All @@ -259,7 +266,7 @@ function steps_getdeps($os_vnd) {
--disable-extstore \
--disable-option-checking \
;
make -j2
make -j4
make install
cd ..
echo MEMCACHED_BINARY="${MEMCACHED_PREFIX}/bin/memcached" >> ${GITHUB_ENV}
Expand All @@ -273,15 +280,15 @@ function steps_build() {
- name: Generate build tree (${{ env.CMAKE_BUILD_TYPE }})
run: cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
- name: Build all with ${{ env.CXX }} ${{ env.CXXFLAGS }}
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j4
<?php
}

function steps_test() {
?>
- name: Test
if: env.BUILD_TESTING == 'ON'
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target test
run: cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j4 --target test
- name: Install
if: env.BUILD_TESTING == 'ON'
run: cmake --install build --config ${{ env.CMAKE_BUILD_TYPE }} --prefix /tmp
Expand All @@ -299,10 +306,10 @@ function steps_package() {
if: env.PUSH_ARTIFACTS_ID != '' && env.CMAKE_BUILD_TYPE == 'Release'
run: |
cmake -DCMAKE_BUILD_TYPE=${{ env.CMAKE_BUILD_TYPE }} -S . -B build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j4 --target package
cmake -DCPACK_COMPONENT_INSTALL=ON build
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j2 --target push-artifacts
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j4 --target package
cmake --build build --config ${{ env.CMAKE_BUILD_TYPE }} -j4 --target push-artifacts
<?php
}

Expand Down Expand Up @@ -398,7 +405,16 @@ jobs:
continue-on-error: true
strategy:
matrix:
memcached: ['master', '1.6.22', '1.6.17', '1.6.9', '1.5.22', '1.5.6']
memcached:
- 'master'
- '1.6.38' # Debian 13, FreeBSD 14
# - '1.6.37' # Ubuntu 25.04
- '1.6.24' # Ubuntu 24.04
# - '1.6.23' # Enterprise Linux 10
- '1.6.18' # Debian 12
- '1.6.14' # Ubuntu 22.04, Amazon Linux 2023
- '1.6.9' # Debian 11, Enterprise Linux 9
- '1.5.22' # Last 1.5 release
env:
CMAKE_BUILD_TYPE: "Debug"
BUILD_TESTING: "ON"
Expand All @@ -413,6 +429,7 @@ jobs:
repository: memcached/memcached
path: memcached
ref: ${{ matrix.memcached }}
fetch-depth: ${{ matrix.memcached != 'master' }}
<?php steps("Linux"); ?>

# coverage linux
Expand All @@ -434,11 +451,10 @@ jobs:
with:
repository: memcached/memcached
path: memcached
ref: 1.6.7
ref: 1.6.39
<?php steps("Linux"); ?>
- uses: codecov/codecov-action@v3


# coverage mac
debug-coverage-mac:
name: debug coverage (<?=defaults("macOS")?>)
Expand All @@ -462,7 +478,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os_ver: [macos-12, macos-11, macos-10.15]
os_ver: [macos-13, macos-14, macos-15]
runs-on: ${{ matrix.os_ver }}
env:
CMAKE_BUILD_TYPE: "Release"
Expand All @@ -481,7 +497,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os_ver: [windows-2022, windows-2019]
os_ver: [windows-2022, windows-2025]
cc_vnd: [msvc, mingw]
cc_ver: [cur]
runs-on: ${{ matrix.os_ver }}
Expand All @@ -503,7 +519,7 @@ jobs:
strategy:
fail-fast: false
matrix:
os_ver: [ubuntu-22.04, ubuntu-20.04]
os_ver: [ubuntu-22.04, ubuntu-24.04]
cc_vnd: [gnu, clang]
cc_ver: [new, cur, old]
runs-on: ${{ matrix.os_ver }}
Expand Down
Loading
Loading