From 329eb419f51d9849aa91e5549d4290ab42f443df Mon Sep 17 00:00:00 2001 From: sdarwin Date: Fri, 19 Aug 2022 10:57:06 -0600 Subject: [PATCH] drone.jsonnet update --- .drone.jsonnet | 6 +++++- .drone/drone.sh | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.drone.jsonnet b/.drone.jsonnet index 6569f585..41a73d36 100644 --- a/.drone.jsonnet +++ b/.drone.jsonnet @@ -32,6 +32,7 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch commands: [ 'set -e', + 'uname -a', 'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -', ] + (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) + @@ -63,6 +64,7 @@ local macos_pipeline(name, environment, xcode_version = "12.2", osx_version = "c environment: environment + { "DEVELOPER_DIR": "/Applications/Xcode-" + xcode_version + ".app/Contents/Developer" }, commands: [ + 'uname -a', 'export LIBRARY=' + library, './.drone/drone.sh', ] @@ -89,6 +91,7 @@ local windows_pipeline(name, image, environment, arch = "amd64") = environment: environment, commands: [ + 'echo $env:DRONE_STAGE_MACHINE', 'cmd /C .drone\\\\drone.bat ' + library, ] } @@ -168,8 +171,9 @@ local windows_pipeline(name, image, environment, arch = "amd64") = ), macos_pipeline( - "MacOS 10.15 Xcode 12.2 ASAN", + "MacOS 12.4 Xcode 13.4.1 ASAN", { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' } + asan, + xcode_version = "13.4.1", osx_version = "monterey", ), windows_pipeline( diff --git a/.drone/drone.sh b/.drone/drone.sh index 7172f7fc..2f2125df 100755 --- a/.drone/drone.sh +++ b/.drone/drone.sh @@ -5,6 +5,7 @@ # https://www.boost.org/LICENSE_1_0.txt set -ex +export PATH=~/.local/bin:/usr/local/bin:$PATH DRONE_BUILD_DIR=$(pwd)