Update .drone.jsonnet

This commit is contained in:
Peter Dimov
2022-02-07 07:01:09 +02:00
parent fd2029714c
commit d31781ed9c

View File

@@ -7,7 +7,7 @@ local triggers =
branch: [ "master", "develop", "feature/*" ] branch: [ "master", "develop", "feature/*" ]
}; };
local linux_pipeline(name, image, environment, packages = "", sources = "", arch = "amd64") = local linux_pipeline(name, image, environment, packages = "", sources = [], arch = "amd64") =
{ {
name: name, name: name,
kind: "pipeline", kind: "pipeline",
@@ -25,14 +25,12 @@ local linux_pipeline(name, image, environment, packages = "", sources = "", arch
"image": image, "image": image,
"environment": environment, "environment": environment,
"commands": "commands":
[ [ 'set -e' ]
'set -e', + (if sources != [] then [ ("apt-add-repository " + source) for source in sources ] else [])
+ (if packages != "" then [ "apt-get update; apt-get install " + packages ] else [])
+ [
'SELF=system', 'SELF=system',
if sources != "" then "apt-add-repository " + sources else "",
if packages != "" then "apt-get install " + packages else "",
'DRONE_BUILD_DIR=$(pwd)', 'DRONE_BUILD_DIR=$(pwd)',
'BOOST_BRANCH=develop', 'BOOST_BRANCH=develop',
'if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi', 'if [ "$DRONE_BRANCH" = "master" ]; then BOOST_BRANCH=master; fi',
@@ -86,6 +84,6 @@ local windows_pipeline =
"cppalliance/droneubuntu2004:1", "cppalliance/droneubuntu2004:1",
{ TOOLSET: 'clang', COMPILER: 'clang++-13', CXXSTD: '17', ADDRMD: '64' }, { TOOLSET: 'clang', COMPILER: 'clang++-13', CXXSTD: '17', ADDRMD: '64' },
"clang-13", "clang-13",
"deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main" ["deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main"]
), ),
] ]