fix
Some checks failed
BlockStorage/repertory_linux_builds/pipeline/head There was a failure building this commit
Some checks failed
BlockStorage/repertory_linux_builds/pipeline/head There was a failure building this commit
This commit is contained in:
@@ -68,10 +68,7 @@ pipeline {
|
|||||||
agent {
|
agent {
|
||||||
dockerfile {
|
dockerfile {
|
||||||
filename 'mingw64'
|
filename 'mingw64'
|
||||||
<<<<<<< HEAD
|
|
||||||
=======
|
|
||||||
additionalBuildArgs '--build-arg NUM_JOBS=8'
|
additionalBuildArgs '--build-arg NUM_JOBS=8'
|
||||||
>>>>>>> 6ecad9af72106de84ac2984785f3838d7391ffca
|
|
||||||
dir 'docker/64_bit'
|
dir 'docker/64_bit'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user