Skip to content

Commit 298c48b

Browse files
authored
Upgraded to xeus-zmq 3.1.1 and upgraded GHA runners (#92)
* Upgraded to xeus-zmq 3.1.1 and upgraded GHA runners * Upgraded minimal CMake version * Upper bound on cmake in environment file
1 parent 4200b49 commit 298c48b

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
os: [ubuntu-22.04, macos-13]
25+
os: [ubuntu-24.04, macos-14]
2626
build_type: [static_build, shared_build]
2727

2828
steps:

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# The full license is in the file LICENSE, distributed with this software. #
88
############################################################################
99

10-
cmake_minimum_required(VERSION 3.4.3)
10+
cmake_minimum_required(VERSION 3.20)
1111
project(xeus-sql)
1212

1313
set(XEUS_SQL_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)

environment-dev.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@ channels:
33
- conda-forge
44
dependencies:
55
# Build dependencies
6-
- cmake
6+
- cmake <4
77
- cxx-compiler
88
- ninja
99
# host dependencies
1010
- cpp-tabulate>=1.5
1111
- cppzmq
1212
- nlohmann_json
1313
- soci-core
14-
- xeus-zmq>=3,<4
14+
- xeus-zmq>=3.1.1,<4
1515
- xproperty
16-
- xvega-bindings>=0.1.0
17-
- xvega>=0.1.0
16+
- xvega-bindings>=0.1.1
17+
- xvega>=0.1.3
1818
# Test dependencies
1919
- doctest >= 2.4.6

test/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.1)
1+
cmake_minimum_required(VERSION 3.20)
22

33
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
44
project(xeus_sql-test)

0 commit comments

Comments
 (0)