mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-06-11 00:24:47 -07:00
CI: Some cleanup (#5959)
* Update desktop-build.yml * Update desktop-build.yml * use CMAKE_GENERATOR in docker.sh * revert to mtime
This commit is contained in:
parent
0ab2b62759
commit
09fbdadcd5
2 changed files with 15 additions and 13 deletions
|
|
@ -147,7 +147,9 @@ function RUN ()
|
|||
if [[ $CCACHE_DIR ]]; then
|
||||
args+=(--mount "type=bind,source=$CCACHE_DIR,target=/.ccache")
|
||||
args+=(--env "CCACHE_DIR=/.ccache")
|
||||
args+=(--env "CMAKE_GENERATOR="Ninja"")
|
||||
fi
|
||||
if [[ -n "$CMAKE_GENERATOR" ]]; then
|
||||
args+=(--env "CMAKE_GENERATOR=$CMAKE_GENERATOR")
|
||||
fi
|
||||
docker run "${args[@]}" $RUN_ARGS "$IMAGE_NAME" bash "$BUILD_SCRIPT" $RUN_OPTS "$@"
|
||||
return $?
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue