Commit 0441bf70 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents 2640197e efad4436
Pipeline #15240 passed with stages
in 3 minutes and 35 seconds
......@@ -81,16 +81,16 @@ mat_windows:
stage: build
#variables:
# NO_LUA_SAFE: '1' # on client no lua safe
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
exec_windows:
extends: ._exec_build
tags:
- vs
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
dependencies:
- mat_common
- mat_windows
......@@ -108,6 +108,11 @@ exec_linux:
extends: ._exec_build
tags:
- linux
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
dependencies:
- mat_common
- mat_linux
......@@ -128,6 +133,11 @@ exec_debian:
extends: ._exec_build
tags:
- linux
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
dependencies:
- mat_common
- mat_linux
......
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