Commit e18a7c56 authored by nanahira's avatar nanahira

Revert "fix cache conflict"

This reverts commit efad4436.
parent 0f146287
Pipeline #15245 failed with stages
in 6 minutes and 18 seconds
...@@ -125,16 +125,16 @@ mat_windows: ...@@ -125,16 +125,16 @@ mat_windows:
stage: build stage: build
variables: variables:
NO_LUA_SAFE: '1' # on client no lua safe NO_LUA_SAFE: '1' # on client no lua safe
exec_windows:
extends: ._exec_build
tags:
- vs
cache: cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG" key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths: paths:
- bin/ - bin/
- obj/ - obj/
exec_windows:
extends: ._exec_build
tags:
- vs
dependencies: dependencies:
- mat_common - mat_common
- mat_irrklang - mat_irrklang
...@@ -153,11 +153,6 @@ exec_linux: ...@@ -153,11 +153,6 @@ exec_linux:
extends: ._exec_build extends: ._exec_build
tags: tags:
- linux - linux
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
dependencies: dependencies:
- mat_common - mat_common
- mat_irrklang - mat_irrklang
...@@ -197,23 +192,12 @@ exec_macos_platform_x86: ...@@ -197,23 +192,12 @@ exec_macos_platform_x86:
extends: ._exec_macos_platform extends: ._exec_macos_platform
tags: tags:
- macos - macos
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
exec_macos_platform_m1: exec_macos_platform_m1:
extends: ._exec_macos_platform extends: ._exec_macos_platform
tags: tags:
- macos-m1 - macos-m1
cache:
key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths:
- bin/
- obj/
exec_macos: exec_macos:
stage: combine stage: combine
......
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