Commit bf82ba8a authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 875c5d52 7f018b01
Pipeline #11725 failed with stages
in 2 minutes and 26 seconds
......@@ -8,8 +8,6 @@ export EVENT_LIB_DIR=$PWD/libevent-stable/lib
export IRRLICHT_INCLUDE_DIR=$PWD/irrlicht/include
export IRRLICHT_LIB_DIR=$PWD/irrlicht
git submodule update --init
./premake5 gmake --cc=clang --build-freetype --build-sqlite
cd build
......
......@@ -9,7 +9,6 @@ ARCHIVE_FILES=(ygopro LICENSE README.md lib lflist.conf strings.conf system.conf
TARGET_PLATFORM=linux
apt update && apt -y install tar git zstd
git submodule update --init
mkdir dist replay
tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"
......@@ -9,7 +9,6 @@ ARCHIVE_FILES=(ygopro.app LICENSE README.md lflist.conf strings.conf system.conf
TARGET_PLATFORM=darwin
apt update && apt -y install tar git zstd
git submodule update --init
mkdir dist replay
tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"
......@@ -12,7 +12,6 @@ fi
TARGET_PLATFORM=win32
apt update && apt -y install p7zip-full git
git submodule update --init
mkdir dist replay
7z a -mx9 -xr!.git* dist/KoishiPro-$CI_COMMIT_REF_NAME-win32-$TARGET_LOCALE.7z "${ARCHIVE_FILES[@]}"
......@@ -13,7 +13,6 @@ fi
TARGET_PLATFORM=win32
apt update && apt -y install tar git zstd
git submodule update --init
mkdir dist replay
tar -acf "dist/KoishiPro-$CI_COMMIT_REF_NAME-$TARGET_PLATFORM-$TARGET_LOCALE.tar.$ARCHIVE_SUFFIX" --exclude='.git*' "${ARCHIVE_FILES[@]}"
......@@ -30,6 +30,16 @@ mat_common:
#- freetype
- sqlite3
mat_submodules:
stage: prepare
tags:
- linux
script: git submodule update --init
artifacts:
paths:
- ocgcore
- script
mat_linux:
stage: prepare
tags:
......@@ -81,8 +91,8 @@ exec_windows:
dependencies:
- mat_common
- mat_windows
- mat_submodules
script:
- git submodule update --init
- bash -c 'cp -rf premake/* .'
- '.\premake5.exe vs2019'
- cmd /c '"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\msbuild.exe" build\YGOPro.sln /m /p:Configuration=Release'
......@@ -98,9 +108,9 @@ exec_linux:
dependencies:
- mat_common
- mat_linux
- mat_submodules
script:
- apt update; apt -y install git build-essential
- git submodule update --init
- ./premake5 gmake --build-sqlite
- cd build
- make config=release -j$(nproc)
......@@ -118,9 +128,9 @@ exec_debian:
dependencies:
- mat_common
- mat_linux
- mat_submodules
script:
- apt update; apt -y install git build-essential liblua5.3-dev libsqlite3-dev libevent-dev
- git submodule update --init
- ./premake5 gmake --lua-deb
- cd build
- make config=release -j$(nproc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment