From 0113996e01e508fc8831f0963e51201239ca5802 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Thu, 18 Feb 2021 19:10:10 +0000 Subject: [PATCH] Cirrus: Add download task for macOS --- .cirrus.yml | 19 +++++++++++++++++++ tools/cirrus_gen_yml.sh | 6 ++++++ 2 files changed, 25 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 182c07a..1737e88 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -578,3 +578,22 @@ release_windows_i686_release_docker_builder: depends_on: - "release_windows_i686_plain-binaries" +release_osx_x86_64_download_docker_builder: + timeout_in: 120m + out_release_osx_x86_64_cache: + folder: out + fingerprint_script: + - "echo out_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out" + git_release_osx_x86_64_cache: + folder: git_clones + fingerprint_script: + - "echo git_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_clones" + build_script: + - "./tools/cirrus_build_project.sh ncdns release osx x86_64 0" + diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh index 7d53b13..877daf2 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -28,6 +28,11 @@ print_os_arch () { - \"./tools/cirrus_build_project.sh ncdns ${CHANNEL} ${OS} ${ARCH} 0\"" echo "" + # osx from clang onward doesn't work on Cirrus yet + if [[ "$OS" == "osx" ]]; then + return 0 + fi + # TODO fine-tune this list for PROJECT in goeasyconfig ncdns ncp11 ncprop279 plain-binaries release; do echo "${CHANNEL}_${OS}_${ARCH}_${PROJECT}_docker_builder: @@ -69,6 +74,7 @@ for CHANNEL in release; do print_os_arch linux i686 print_os_arch windows x86_64 print_os_arch windows i686 + print_os_arch osx x86_64 done ) > .cirrus.yml