Update Github Actions

master
Maksim 2022-04-09 13:05:37 +02:00
parent aea47b3afe
commit bbd89e8332
5 changed files with 21 additions and 19 deletions

View File

@ -21,24 +21,25 @@ on:
jobs: jobs:
build: build:
runs-on: ubuntu-18.04 runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Set up JDK 11 - name: Set up JDK 11
uses: actions/setup-java@v1 uses: actions/setup-java@v3
with: with:
distribution: 'temurin'
java-version: '11' java-version: '11'
- name: Install GNU gettext - name: Install GNU gettext
run: sudo apt install gettext run: sudo apt install gettext
- name: Build with Gradle - name: Build with Gradle
run: cd build/android; ./gradlew assemblerelease run: cd build/android; ./gradlew assemblerelease
- name: Save armeabi artifact - name: Save armeabi artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: MultiCraft-armeabi-v7a.apk name: MultiCraft-armeabi-v7a.apk
path: build/android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk path: build/android/app/build/outputs/apk/release/app-armeabi-v7a-release-unsigned.apk
- name: Save arm64 artifact - name: Save arm64 artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v3
with: with:
name: MultiCraft-arm64-v8a.apk name: MultiCraft-arm64-v8a.apk
path: build/android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk path: build/android/app/build/outputs/apk/release/app-arm64-v8a-release-unsigned.apk

View File

@ -50,7 +50,7 @@ jobs:
# This is the current gcc compiler (available in bionic) # This is the current gcc compiler (available in bionic)
gcc_8: gcc_8:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
@ -93,7 +93,7 @@ jobs:
# This is the current clang version # This is the current clang version
clang_9: clang_9:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install deps - name: Install deps
@ -171,7 +171,7 @@ jobs:
docker: docker:
name: "Docker image" name: "Docker image"
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Build docker image - name: Build docker image
@ -180,7 +180,7 @@ jobs:
win32: win32:
name: "MinGW cross-compiler (32-bit)" name: "MinGW cross-compiler (32-bit)"
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install compiler - name: Install compiler
@ -198,7 +198,7 @@ jobs:
win64: win64:
name: "MinGW cross-compiler (64-bit)" name: "MinGW cross-compiler (64-bit)"
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install compiler - name: Install compiler
@ -218,9 +218,9 @@ jobs:
name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }} name: VS 2019 ${{ matrix.config.arch }}-${{ matrix.type }}
runs-on: windows-2019 runs-on: windows-2019
env: env:
VCPKG_VERSION: 5568f110b509a9fd90711978a7cb76bae75bb092 VCPKG_VERSION: af2287382b1991dbdcb7e5112d236f3323b9dd7a
# 2021.05.12 # 2022.03.10
vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit vcpkg_packages: irrlicht zlib curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit libiconv gettext jsoncpp
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
@ -259,6 +259,7 @@ jobs:
-DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" ` -DCMAKE_TOOLCHAIN_FILE="${{ github.workspace }}\vcpkg\scripts\buildsystems\vcpkg.cmake" `
-DCMAKE_BUILD_TYPE=Release ` -DCMAKE_BUILD_TYPE=Release `
-DENABLE_POSTGRESQL=OFF ` -DENABLE_POSTGRESQL=OFF `
-DENABLE_SYSTEM_JSONCPP=ON `
-DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} . -DRUN_IN_PLACE=${{ contains(matrix.type, 'portable') }} .
- name: Build - name: Build
@ -280,7 +281,7 @@ jobs:
- name: Package Clean - name: Package Clean
run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages run: rm -r $env:GITHUB_WORKSPACE\Package\_CPack_Packages
- uses: actions/upload-artifact@v1 - uses: actions/upload-artifact@v3
with: with:
name: msvc-${{ matrix.config.arch }}-${{ matrix.type }} name: msvc-${{ matrix.config.arch }}-${{ matrix.type }}
path: .\Package\ path: .\Package\

View File

@ -6,9 +6,10 @@ cmake_policy(SET CMP0025 OLD)
project(multicraft) project(multicraft)
set(PROJECT_NAME_CAPITALIZED "MultiCraft") set(PROJECT_NAME_CAPITALIZED "MultiCraft")
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 14)
set(GCC_MINIMUM_VERSION "4.8") set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
set(CLANG_MINIMUM_VERSION "3.4") set(GCC_MINIMUM_VERSION "5.1")
set(CLANG_MINIMUM_VERSION "3.5")
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing # Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
set(VERSION_MAJOR 2) set(VERSION_MAJOR 2)

View File

@ -1,4 +1,4 @@
FROM alpine:3.11 FROM alpine:3.14
ENV MINETEST_GAME_VERSION master ENV MINETEST_GAME_VERSION master
@ -49,7 +49,7 @@ RUN mkdir build && \
make -j2 && \ make -j2 && \
make install make install
FROM alpine:3.11 FROM alpine:3.14
RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit && \ RUN apk add --no-cache sqlite-libs curl gmp libstdc++ libgcc libpq luajit && \
adduser -D multicraft --uid 30000 -h /var/lib/multicraft && \ adduser -D multicraft --uid 30000 -h /var/lib/multicraft && \

View File

@ -737,7 +737,6 @@ if(MSVC)
endif() endif()
else() else()
# GCC or compatible compilers such as Clang # GCC or compatible compilers such as Clang
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
if(WARN_ALL) if(WARN_ALL)
set(RELEASE_WARNING_FLAGS "-Wall") set(RELEASE_WARNING_FLAGS "-Wall")
else() else()