Skip to content

ci: bump ubuntu version #134

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

Merged
merged 1 commit into from
Apr 18, 2025
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
15 changes: 10 additions & 5 deletions .github/workflows/check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,22 @@ jobs:
if: |
github.event_name == 'push' ||
github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Setup Tarantool
uses: tarantool/setup-tarantool@v1
uses: tarantool/setup-tarantool@v3
with:
tarantool-version: '2.8'
tarantool-version: '3.3'

- name: Setup luacheck
run: tarantoolctl rocks install luacheck 0.25.0
run: |
sudo apt update
sudo apt install -y curl
curl -L https://tarantool.io/release/3/installer.sh | bash
sudo apt install -y tt
tt rocks install luacheck 0.25.0

- run: cmake -S . -B build

Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/packaging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,29 @@ jobs:
platform:
- { os: 'almalinux', dist: '8'}
- { os: 'almalinux', dist: '9'}
- { os: 'debian', dist: 'stretch' }
- { os: 'debian', dist: 'buster' }
- { os: 'debian', dist: 'bullseye' }
- { os: 'el', dist: '7' }
- { os: 'debian', dist: 'bookworm' }
- { os: 'el', dist: '8' }
- { os: 'fedora', dist: '34' }
- { os: 'fedora', dist: '35' }
- { os: 'fedora', dist: '36' }
- { os: 'ubuntu', dist: 'xenial' }
- { os: 'ubuntu', dist: 'bionic' }
- { os: 'ubuntu', dist: 'focal' }
- { os: 'ubuntu', dist: 'jammy' }
- { os: 'ubuntu', dist: 'noble' }

env:
OS: ${{ matrix.platform.os }}
DIST: ${{ matrix.platform.dist }}

steps:
- name: Clone the module
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
submodules: recursive

- name: Clone the packpack tool
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: packpack/packpack
path: packpack
Expand Down
19 changes: 12 additions & 7 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,19 @@ on:
jobs:
publish-rockspec-scm-1:
if: github.ref == 'refs/heads/master'
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: tarantool/rocks.tarantool.org/github-action@master
with:
auth: ${{ secrets.ROCKS_AUTH }}
files: memcached-scm-1.rockspec

publish-rockspec-tag:
if: startsWith(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

# Create a rockspec for the release.
- run: printf '%s=%s\n' TAG "${GITHUB_REF##*/}" >> "${GITHUB_ENV}"
Expand Down Expand Up @@ -48,10 +48,15 @@ jobs:
# LuaJIT's FFI and tarantool specific features are okay.
#
# [1]: https://github.com/luarocks/luarocks/wiki/Types-of-rocks
- uses: tarantool/setup-tarantool@v2
- uses: tarantool/setup-tarantool@v3
with:
tarantool-version: '2.10'
- run: tarantoolctl rocks pack memcached-${{ env.TAG }}-1.rockspec
tarantool-version: '3.3'
- run: |
sudo apt update
sudo apt install -y curl
curl -L https://tarantool.io/release/3/installer.sh | bash
sudo apt install -y tt
tt rocks pack memcached-${{ env.TAG }}-1.rockspec

# Upload .rockspec and .src.rock.
- uses: tarantool/rocks.tarantool.org/github-action@master
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ on:

jobs:
run_tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-24.04
steps:
- name: Clone the memcached module
uses: actions/checkout@v4
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/testing.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ jobs:
github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name != github.repository
strategy:
matrix:
tarantool-version: ['1.10', '2.2', '2.3', '2.4', '2.5', '2.6', '2.7', '2.8', '2.x-latest']
tarantool-version: ['2.11', '3.3']
fail-fast: false
runs-on: [ubuntu-20.04]
runs-on: [ubuntu-24.04]
steps:
- name: Clone the repository
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: ${{ github.repository_owner }}/memcached
# Enable recursive submodules checkout as test-run git module is used
Expand All @@ -25,7 +25,7 @@ jobs:

- name: Setup Tarantool (version is not equal to latest 2.x)
if: matrix.tarantool-version != '2.x-latest'
uses: tarantool/setup-tarantool@v1
uses: tarantool/setup-tarantool@v3
with:
tarantool-version: ${{ matrix.tarantool-version }}

Expand All @@ -36,14 +36,14 @@ jobs:
sudo apt install -y tarantool tarantool-dev

- name: Install build requirements
run: sudo apt-get -y install libsasl2-dev libevent-dev
run: sudo apt-get -y install libsasl2-dev libevent-dev libpcre3-dev

- run: cmake .

- name: Setup Python 3 for tests
uses: actions/setup-python@v2
uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.9

- name: Install test requirements
run: pip install -r test-run/requirements.txt
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
cmake_minimum_required(VERSION 3.10...3.31 FATAL_ERROR)

project(memcached C)

if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)
endif()

# Fix problem with old third_party dependencies
set(CMAKE_POLICY_VERSION_MINIMUM 3.5)

set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})

# Find Tarantool and Lua dependencies
Expand Down
10 changes: 2 additions & 8 deletions debian/prebuild.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
#!/bin/bash

set -exu # Strict shell (w/o -o pipefail)
set -e -o pipefail

# At the time of adding the changes, tarantool 1.10 is absent in the
# repositories Ubuntu impish and jammy.
if [[ $DIST == "impish" ]] || [[ $DIST == "jammy" ]]; then
curl -LsSf https://www.tarantool.io/release/2/installer.sh | sudo bash
else
curl -LsSf https://www.tarantool.io/release/1.10/installer.sh | sudo bash
fi
curl -LsSf https://www.tarantool.io/release/2/installer.sh | sudo bash
4 changes: 2 additions & 2 deletions rpm/prebuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,6 @@ if [[ "$os" == "almalinux" && "$dist" == 9* ]]; then
sudo sh -c "echo 8 > /etc/centos-release"
curl -LsSf https://tarantool.io/release/3/installer.sh | sudo bash
else
# We need to execute the 1.10 script due to it works for other platforms.
curl -LsSf https://tarantool.io/release/1.10/installer.sh | sudo bash
# We need to execute the 2 script due to it works for other platforms.
curl -LsSf https://tarantool.io/release/2/installer.sh | sudo bash
fi
2 changes: 1 addition & 1 deletion third_party/libmemcached
Loading