Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro
Commits
efad4436
Commit
efad4436
authored
Aug 02, 2022
by
nanahira
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix cache conflict
parent
44822c06
Pipeline
#15239
failed with stages
in 9 minutes and 11 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
5 deletions
+21
-5
.gitlab-ci.yml
.gitlab-ci.yml
+21
-5
No files found.
.gitlab-ci.yml
View file @
efad4436
...
...
@@ -125,16 +125,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_irrklang
...
...
@@ -153,6 +153,11 @@ exec_linux:
extends
:
._exec_build
tags
:
-
linux
cache
:
key
:
"
$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths
:
-
bin/
-
obj/
dependencies
:
-
mat_common
-
mat_irrklang
...
...
@@ -192,12 +197,23 @@ exec_macos_platform_x86:
extends
:
._exec_macos_platform
tags
:
-
macos
cache
:
key
:
"
$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths
:
-
bin/
-
obj/
exec_macos_platform_m1
:
extends
:
._exec_macos_platform
tags
:
-
macos-m1
cache
:
key
:
"
$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
paths
:
-
bin/
-
obj/
exec_macos
:
stage
:
combine
...
...
nanahira
@nanahira
mentioned in commit
e18a7c56
·
Aug 02, 2022
mentioned in commit
e18a7c56
mentioned in commit e18a7c564d4ba15f845aa68188d349654b3ac1ab
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment