Skip to content

Y
ygopro
Commit efad4436 authored by nanahira's avatar nanahira
1 Browse files
Options

fix cache conflict

parent 44822c06
Pipeline #15239 failed with stages
            in 9 minutes and 11 seconds
            Show whitespace changes
            Inline Side-by-side
            Showing with 21 additions and 5 deletions
            .gitlab-ci.yml
            View file @ efad4436
            ...@@ -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
            cache:
            key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
            paths:
            - bin/
            - obj/
            exec_windows: exec_windows:
            extends: ._exec_build extends: ._exec_build
            tags: tags:
            - vs - vs
            cache:
            key: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
            paths:
            - bin/
            - obj/
            dependencies: dependencies:
            - mat_common - mat_common
            - mat_irrklang - mat_irrklang
            ...@@ -153,6 +153,11 @@ exec_linux: ...@@ -153,6 +153,11 @@ 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
            ...@@ -192,12 +197,23 @@ exec_macos_platform_x86: ...@@ -192,12 +197,23 @@ 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