Skip to content

Commit 2cc7c74

Browse files
authored
Merge pull request #112 from project-tsurugi/ci-bump-matrix-os
ci: supports CI on Ubuntu 24.04
2 parents b11d77c + 796e05a commit 2cc7c74

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

.github/workflows/ci-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
os: [ubuntu-22.04]
10+
os: [ubuntu-22.04, ubuntu-24.04]
1111
name: Build Metadata-Manager ( ${{ matrix.os }} )
1212
runs-on: [self-hosted, docker]
1313
timeout-minutes: 30
@@ -29,7 +29,7 @@ jobs:
2929
mkdir ci_test
3030
3131
- name: Checkout_Postgresql
32-
uses: actions/checkout@v3
32+
uses: actions/checkout@v4
3333
with:
3434
path: ci_test
3535
submodules: true
@@ -55,7 +55,7 @@ jobs:
5555
mkdir ci_test2
5656
5757
- name: Checkout_Json
58-
uses: actions/checkout@v3
58+
uses: actions/checkout@v4
5959
with:
6060
path: ci_test2
6161
submodules: true

cmake/CompileOptions.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,5 @@ endif()
4343

4444
function(set_compile_options target_name)
4545
target_compile_options(${target_name}
46-
PRIVATE -Wall -Wextra -Werror)
46+
PRIVATE -Wall -Wextra -Werror -Wno-overloaded-virtual)
4747
endfunction(set_compile_options)

test/src/test/scenario_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ TEST_P(UpdateTest, test_update) {
812812

813813
auto update_data_creator = metadata_test->get_update_data_creator();
814814
// Generate data for updating.
815-
auto ut_metadata_update = std::move(update_data_creator(before_ptree));
815+
auto ut_metadata_update = update_data_creator(before_ptree);
816816

817817
auto updated_metadata = ut_metadata_update->get_metadata_ptree();
818818
// Update metadata.

0 commit comments

Comments
 (0)