diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 4cc1c0016..628b36f03 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -21,24 +21,25 @@ on: jobs: build: - runs-on: ubuntu-18.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v2 - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v3 with: + distribution: 'temurin' java-version: '11' - name: Install GNU gettext run: sudo apt install gettext - name: Build with Gradle run: cd build/android; ./gradlew assemblerelease - name: Save armeabi artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: MultiCraft-armeabi-v7a.apk path: build/android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk - name: Save arm64 artifact - uses: actions/upload-artifact@v2 + uses: actions/upload-artifact@v3 with: name: MultiCraft-arm64-v8a.apk path: build/android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a202a156e..2c1f39f72 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -50,7 +50,7 @@ jobs: # This is the current gcc compiler (available in bionic) gcc_8: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Install deps @@ -93,7 +93,7 @@ jobs: # This is the current clang version clang_9: - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Install deps @@ -171,7 +171,7 @@ jobs: docker: name: "Docker image" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Build docker image @@ -180,7 +180,7 @@ jobs: win32: name: "MinGW cross-compiler (32-bit)" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Install compiler @@ -198,7 +198,7 @@ jobs: win64: name: "MinGW cross-compiler (64-bit)" - runs-on: ubuntu-18.04 + runs-on: ubuntu-20.04 steps: - uses: actions/checkout@v2 - name: Install compiler @@ -218,9 +218,9 @@ jobs: name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} runs-on: windows-2019 env: - VCPKG_VERSION: 5568f110b509a9fd90711978a7cb76bae75bb092 -# 2021.05.12 - vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit + VCPKG_VERSION: af2287382b1991dbdcb7e5112d236f3323b9dd7a +# 2022.03.10 + vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit libiconv gettext jsoncpp strategy: fail-fast: false matrix: @@ -259,6 +259,7 @@ jobs: -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_BUILD_TYPE=Release ` -DENABLE_POSTGRESQL=OFF ` + -DENABLE_SYSTEM_JSONCPP=ON ` -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} . - name: Build @@ -280,7 +281,7 @@ jobs: - name: Package Clean run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages - - uses: actions/upload-artifact@v1 + - uses: actions/upload-artifact@v3 with: name: msvc-${{ matrix.config.arch }}-${{ matrix.type }} path: .\Package\ diff --git a/CMakeLists.txt b/CMakeLists.txt index c85d9549c..94ff0cd03 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,9 +6,10 @@ cmake_policy(SET CMP0025 OLD) project(multicraft) set(PROJECT_NAME_CAPITALIZED "MultiCraft") -set(CMAKE_CXX_STANDARD 11) -set(GCC_MINIMUM_VERSION "4.8") -set(CLANG_MINIMUM_VERSION "3.4") +set(CMAKE_CXX_STANDARD 14) +set(CMAKE_CXX_STANDARD_REQUIRED TRUE) +set(GCC_MINIMUM_VERSION "5.1") +set(CLANG_MINIMUM_VERSION "3.5") # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing set(VERSION_MAJOR 2) diff --git a/Dockerfile b/Dockerfile index 1732f4d55..3d235cc70 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.11 +FROM alpine:3.14 ENV MINETEST_GAME_VERSION master @@ -49,7 +49,7 @@ RUN mkdir build && \ make -j2 && \ make install -FROM alpine:3.11 +FROM alpine:3.14 RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit && \ adduser -D multicraft --uid 30000 -h /var/lib/multicraft && \ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c925d348e..67c74f253 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -737,7 +737,6 @@ if(MSVC) endif() else() # GCC or compatible compilers such as Clang - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") if(WARN_ALL) set(RELEASE_WARNING_FLAGS "-Wall") else()