Commit 058daeed authored by nanahira's avatar nanahira

Merge branch 'master' into develop

parents 35c41b46 258c1404
Pipeline #28033 passed with stages
in 7 minutes and 17 seconds
...@@ -62,7 +62,7 @@ mat_linux: ...@@ -62,7 +62,7 @@ mat_linux:
stage: prepare stage: prepare
tags: tags:
- linux - linux
image: git-registry.myard.moe/mycard/docker-runner-base:debian11 image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
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
...@@ -154,7 +154,7 @@ exec_linux: ...@@ -154,7 +154,7 @@ exec_linux:
extends: ._exec_build extends: ._exec_build
tags: tags:
- linux - linux
image: git-registry.myard.moe/mycard/docker-runner-base:debian11 image: git-registry.mycard.moe/mycard/docker-runner-base:debian11
dependencies: dependencies:
- mat_common - mat_common
- mat_irrklang - mat_irrklang
......
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