Commit 6f598f5d authored by nanahira's avatar nanahira

update ci and add arm

parent 5e17c0d1
...@@ -52,13 +52,9 @@ mat_linux: ...@@ -52,13 +52,9 @@ mat_linux:
script: script:
- apt update; apt -y install git wget tar - apt update; apt -y install git wget tar
- git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht - git clone --depth=1 https://code.mycard.moe/mycard/irrlicht-new irrlicht
- wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta2-linux.tar.gz | tar zfx -
- env PROCESSOR_COUNT=$(nproc) ./.ci/libevent-prebuild.sh
artifacts: artifacts:
paths: paths:
- premake5
- irrlicht - irrlicht
- libevent-stable
mat_macos: mat_macos:
stage: prepare stage: prepare
...@@ -66,7 +62,7 @@ mat_macos: ...@@ -66,7 +62,7 @@ mat_macos:
- linux - linux
script: script:
- apt update; apt -y install wget tar - apt update; apt -y install wget tar
- wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta2-macosx.tar.gz | tar zfx - - wget -O - https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-macosx.tar.gz | tar zfx -
- mkdir irrlicht - mkdir irrlicht
- cd irrlicht - cd irrlicht
- wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx - - wget -O - https://cdn01.moecube.com/ygopro-build-materials/irrlicht-mycard-mac.tar.gz | tar zfx -
...@@ -83,8 +79,8 @@ mat_windows: ...@@ -83,8 +79,8 @@ mat_windows:
script: script:
- apt update; apt -y install wget tar patch p7zip-full - apt update; apt -y install wget tar patch p7zip-full
# premake5.exe # premake5.exe
- wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta2-windows.zip - wget https://cdn01.moecube.com/ygopro-build-materials/premake-5.0.0-beta5-windows.zip
- 7z x -y premake-5.0.0-beta2-windows.zip - 7z x -y premake-5.0.0-beta5-windows.zip
# event # event
- wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx - - wget -O - https://cdn01.moecube.com/ygopro-build-materials/libevent-2.0.22-stable.tar.gz | tar zfx -
- mv libevent-2.0.22-stable event - mv libevent-2.0.22-stable event
...@@ -123,19 +119,19 @@ exec_windows: ...@@ -123,19 +119,19 @@ exec_windows:
paths: paths:
- ygopro.exe - ygopro.exe
exec_linux: .exec_linux:
extends: ._exec_build extends: ._exec_build
tags: tags:
- linux - linux
image: git-registry.mycard.moe/mycard/docker-runner-base:debian11 image: git-registry.moenext.com/mycard/docker-ygopro-builder
dependencies: dependencies:
- mat_common - mat_common
- mat_linux - mat_linux
- mat_submodules - mat_submodules
variables:
EVENT_INCLUDE_DIR: /usr/share/libevent-stable/include
EVENT_LIB_DIR: /usr/share/libevent-stable/lib
script: script:
- apt update; apt -y install git build-essential libgl1-mesa-dev libglu-dev libxxf86vm-dev
- export EVENT_INCLUDE_DIR=$PWD/libevent-stable/include
- export EVENT_LIB_DIR=$PWD/libevent-stable/lib
- ./premake5 gmake --build-freetype --build-sqlite --build-irrlicht - ./premake5 gmake --build-freetype --build-sqlite --build-irrlicht
- cd build - cd build
- make config=release -j$(nproc) - make config=release -j$(nproc)
...@@ -146,6 +142,14 @@ exec_linux: ...@@ -146,6 +142,14 @@ exec_linux:
paths: paths:
- ygopro - ygopro
exec_linux:
extends: ._exec_linux
exec_linuxarm:
extends: ._exec_linux
tags:
- arm
._exec_macos_platform: ._exec_macos_platform:
extends: ._exec_build extends: ._exec_build
dependencies: dependencies:
...@@ -380,6 +384,15 @@ assets_en-US: ...@@ -380,6 +384,15 @@ assets_en-US:
- assets_zh-CN - assets_zh-CN
- mat_submodules - mat_submodules
._pack_assets_linuxarm_zh-CN:
extends: ._pack
dependencies:
- assets
- assets_nonwindows
- exec_linuxarm
- assets_zh-CN
- mat_submodules
._pack_assets_macos_zh-CN: ._pack_assets_macos_zh-CN:
extends: ._pack extends: ._pack
dependencies: dependencies:
...@@ -407,6 +420,15 @@ assets_en-US: ...@@ -407,6 +420,15 @@ assets_en-US:
- assets_en-US - assets_en-US
- mat_submodules - mat_submodules
._pack_assets_linuxarm_en-US:
extends: ._pack
dependencies:
- assets
- assets_nonwindows
- exec_linuxarm
- assets_en-US
- mat_submodules
._pack_assets_macos_en-US: ._pack_assets_macos_en-US:
extends: ._pack extends: ._pack
dependencies: dependencies:
...@@ -500,6 +522,13 @@ pack_linux_zh-CN_gz: ...@@ -500,6 +522,13 @@ pack_linux_zh-CN_gz:
- ._pack_format_gz - ._pack_format_gz
- ._locale_zh-CN - ._locale_zh-CN
pack_linuxarm_zh-CN_gz:
extends:
- ._pack_assets_linuxarm_zh-CN
- ._pack_script_linux
- ._pack_format_gz
- ._locale_zh-CN
#pack_linux_zh-CN_zst: #pack_linux_zh-CN_zst:
# extends: # extends:
# - ._pack_assets_linux_zh-CN # - ._pack_assets_linux_zh-CN
...@@ -549,6 +578,13 @@ pack_linux_en-US_gz: ...@@ -549,6 +578,13 @@ pack_linux_en-US_gz:
- ._pack_format_gz - ._pack_format_gz
- ._locale_en-US - ._locale_en-US
pack_linuxarm_en-US_gz:
extends:
- ._pack_assets_linuxarm_en-US
- ._pack_script_linux
- ._pack_format_gz
- ._locale_en-US
#pack_linux_en-US_zst: #pack_linux_en-US_zst:
# extends: # extends:
# - ._pack_assets_linux_en-US # - ._pack_assets_linux_en-US
......
Subproject commit 7fe824444afaa7aa38ea067171995d754c7703e0 Subproject commit 1d7398c7e92cf9a53fa483527a9328cc82a067f5
Subproject commit 0e92e4d32b2073615f5bc8005bfba50283844734 Subproject commit 65a4ab26c4f556e0388a9b6c80cbb090cc5569be
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