Update .drone.jsonnet

This commit is contained in:
Peter Dimov
2022-02-07 07:09:14 +02:00
parent d31781ed9c
commit 21ae6f45bc

View File

@@ -25,10 +25,12 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
"image": image, "image": image,
"environment": environment, "environment": environment,
"commands": "commands":
[ 'set -e' ] [
+ (if sources != [] then [ ("apt-add-repository " + source) for source in sources ] else []) 'set -e'
+ (if packages != "" then [ "apt-get update; apt-get install " + packages ] else []) ] +
+ [ (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
(if packages != "" then [ "apt-get update; apt-get -y install " + packages ] else []) +
[
'SELF=system', 'SELF=system',
'DRONE_BUILD_DIR=$(pwd)', 'DRONE_BUILD_DIR=$(pwd)',
@@ -63,20 +65,27 @@ local windows_pipeline =
"Linux 18.04 GCC 8", "Linux 18.04 GCC 8",
"cppalliance/droneubuntu1804:1", "cppalliance/droneubuntu1804:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '14', ADDRMD: '64' }, { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '14', ADDRMD: '64' },
"gcc-8" "gcc-8",
), ),
linux_pipeline( linux_pipeline(
"Linux 20.04 GCC 9", "Linux 20.04 GCC 9",
"cppalliance/droneubuntu2004:1", "cppalliance/droneubuntu2004:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' } { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' },
),
linux_pipeline(
"Linux 20.04 GCC 9+",
"cppalliance/droneubuntu2004:1",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' },
"gcc-9",
), ),
linux_pipeline( linux_pipeline(
"Linux 20.04 GCC 9 ARM", "Linux 20.04 GCC 9 ARM",
"cppalliance/droneubuntu2004:1", "cppalliance/droneubuntu2004:multiarch",
{ TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' }, { TOOLSET: 'gcc', COMPILER: 'g++', CXXSTD: '17', ADDRMD: '64' },
arch="arm64" arch="arm64",
), ),
linux_pipeline( linux_pipeline(
@@ -84,6 +93,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"],
), ),
] ]