Skip to content

Commit f06cc3e

Browse files
authored
Merge branch 'master' into branding200fx
2 parents 330b599 + 86a00b8 commit f06cc3e

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

.github/workflows/main.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ env:
77

88
jobs:
99
build-nix:
10-
name: Ubuntu focal (x86_64) debug
11-
runs-on: ubuntu-20.04
10+
name: Ubuntu (x86_64) debug
11+
runs-on: ubuntu-22.04
1212
env:
1313
BUILD_TYPE: Debug
1414
steps:
@@ -21,8 +21,8 @@ jobs:
2121
run: bash -xe ci/build-nix.sh
2222

2323
build-nix-release:
24-
name: Ubuntu focal (x86_64) release
25-
runs-on: ubuntu-20.04
24+
name: Ubuntu (x86_64) release
25+
runs-on: ubuntu-22.04
2626
steps:
2727
- uses: actions/checkout@v2
2828
- name: Checkout enet submodule
@@ -34,7 +34,7 @@ jobs:
3434

3535
macos-release:
3636
name: macOS (x86_64) release
37-
runs-on: macos-10.15
37+
runs-on: macos-14
3838
steps:
3939
- uses: actions/checkout@v2
4040
- name: Checkout enet submodule
@@ -45,8 +45,8 @@ jobs:
4545
run: bash -xe ci/build-mac.sh
4646

4747
windows-release-cross:
48-
name: Windows (x86_64) release (crossbuild from Ubuntu focal x86_64, MinGW-w64)
49-
runs-on: ubuntu-20.04
48+
name: Windows (x86_64) release (crossbuild from Ubuntu x86_64, MinGW-w64)
49+
runs-on: ubuntu-22.04
5050
steps:
5151
- uses: actions/checkout@v2
5252
- name: Checkout enet submodule

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.0)
1+
cmake_minimum_required(VERSION 3.5)
22

33
# avoid annoying warnings due to use of a ${PREFIX} variable in the toolchain(s)
44
# http://www.steveire.com/embracing-modern-cmake.pdf

0 commit comments

Comments
 (0)