diff --git a/.cirrus.yml b/.cirrus.yml index f676336..aabe08c 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -82,6 +82,8 @@ release_linux_x86_64_gcc_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_download" @@ -128,6 +130,8 @@ release_linux_x86_64_gcc_2_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_gcc_1" @@ -174,6 +178,8 @@ release_linux_x86_64_goeasyconfig_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_gcc_2" @@ -220,6 +226,8 @@ release_linux_x86_64_ncdns_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_goeasyconfig_1" @@ -266,6 +274,8 @@ release_linux_x86_64_ncp11_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_ncdns_1" @@ -312,6 +322,8 @@ release_linux_x86_64_ncprop279_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_ncp11_1" @@ -358,10 +370,12 @@ release_linux_x86_64_plain-binaries_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release linux x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_x86_64_ncprop279_1" -release_linux_x86_64_release_1_docker_builder: +release_linux_x86_64_release_nosign_docker_builder: timeout_in: 120m out_release_linux_x86_64_cache: folder: out @@ -404,6 +418,64 @@ release_linux_x86_64_release_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release linux x86_64 1" + binaries_artifacts: + path: "release/**/*" + env: + SIGN_BUILD: 0 + only_if: $CIRRUS_REPO_OWNER != "namecoin" + depends_on: + - "release_linux_x86_64_plain-binaries_1" + +release_linux_x86_64_release_sign_docker_builder: + timeout_in: 120m + out_release_linux_x86_64_cache: + folder: out + fingerprint_script: + - "echo out_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out" + out1_release_linux_x86_64_cache: + folder: out_cache1 + fingerprint_script: + - "echo out1_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1" + git_release_linux_x86_64_cache: + folder: git_clones + fingerprint_script: + - "echo git_release_linux_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_clones" + interrupted_aa_release_linux_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partaa.folder + fingerprint_script: + - "echo interrupted_aa_release_linux_x86_64" + reupload_on_changes: true + interrupted_ab_release_linux_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partab.folder + fingerprint_script: + - "echo interrupted_ab_release_linux_x86_64" + reupload_on_changes: true + interrupted_ac_release_linux_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partac.folder + fingerprint_script: + - "echo interrupted_ac_release_linux_x86_64" + reupload_on_changes: true + checkpoint_background_script: + - sleep 110m + - ./tools/container-interrupt.sh + build_script: + - "./tools/cirrus_build_project.sh release release linux x86_64 1" + binaries_artifacts: + path: "release/**/*" + only_if: $CIRRUS_REPO_OWNER == "namecoin" + env: + SIGN_BUILD: 1 + SIGN_KEY: ENCRYPTED[33d4594d76774e6447dfd9fabee90f6214b34e209fa1c1c2ce93ed1a40447a235b013b78afe85db52d5561651a821be1] + HOME: /root depends_on: - "release_linux_x86_64_plain-binaries_1" @@ -491,6 +563,8 @@ release_linux_i686_gcc_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_download" @@ -537,6 +611,8 @@ release_linux_i686_gcc_2_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh gcc release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_gcc_1" @@ -583,6 +659,8 @@ release_linux_i686_goeasyconfig_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_gcc_2" @@ -629,6 +707,8 @@ release_linux_i686_ncdns_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_goeasyconfig_1" @@ -675,6 +755,8 @@ release_linux_i686_ncp11_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_ncdns_1" @@ -721,6 +803,8 @@ release_linux_i686_ncprop279_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_ncp11_1" @@ -767,10 +851,12 @@ release_linux_i686_plain-binaries_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release linux i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_linux_i686_ncprop279_1" -release_linux_i686_release_1_docker_builder: +release_linux_i686_release_nosign_docker_builder: timeout_in: 120m out_release_linux_i686_cache: folder: out @@ -813,6 +899,64 @@ release_linux_i686_release_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release linux i686 1" + binaries_artifacts: + path: "release/**/*" + env: + SIGN_BUILD: 0 + only_if: $CIRRUS_REPO_OWNER != "namecoin" + depends_on: + - "release_linux_i686_plain-binaries_1" + +release_linux_i686_release_sign_docker_builder: + timeout_in: 120m + out_release_linux_i686_cache: + folder: out + fingerprint_script: + - "echo out_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out" + out1_release_linux_i686_cache: + folder: out_cache1 + fingerprint_script: + - "echo out1_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1" + git_release_linux_i686_cache: + folder: git_clones + fingerprint_script: + - "echo git_release_linux_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_clones" + interrupted_aa_release_linux_i686_cache: + folder: tmp/interrupted_dirs.tar.gz.partaa.folder + fingerprint_script: + - "echo interrupted_aa_release_linux_i686" + reupload_on_changes: true + interrupted_ab_release_linux_i686_cache: + folder: tmp/interrupted_dirs.tar.gz.partab.folder + fingerprint_script: + - "echo interrupted_ab_release_linux_i686" + reupload_on_changes: true + interrupted_ac_release_linux_i686_cache: + folder: tmp/interrupted_dirs.tar.gz.partac.folder + fingerprint_script: + - "echo interrupted_ac_release_linux_i686" + reupload_on_changes: true + checkpoint_background_script: + - sleep 110m + - ./tools/container-interrupt.sh + build_script: + - "./tools/cirrus_build_project.sh release release linux i686 1" + binaries_artifacts: + path: "release/**/*" + only_if: $CIRRUS_REPO_OWNER == "namecoin" + env: + SIGN_BUILD: 1 + SIGN_KEY: ENCRYPTED[33d4594d76774e6447dfd9fabee90f6214b34e209fa1c1c2ce93ed1a40447a235b013b78afe85db52d5561651a821be1] + HOME: /root depends_on: - "release_linux_i686_plain-binaries_1" @@ -900,6 +1044,8 @@ release_windows_x86_64_mingw-w64_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_download" @@ -946,6 +1092,8 @@ release_windows_x86_64_mingw-w64_2_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_mingw-w64_1" @@ -992,6 +1140,8 @@ release_windows_x86_64_goeasyconfig_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_mingw-w64_2" @@ -1038,6 +1188,8 @@ release_windows_x86_64_ncdns_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_goeasyconfig_1" @@ -1084,6 +1236,8 @@ release_windows_x86_64_ncp11_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_ncdns_1" @@ -1130,6 +1284,8 @@ release_windows_x86_64_ncprop279_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_ncp11_1" @@ -1176,10 +1332,12 @@ release_windows_x86_64_plain-binaries_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release windows x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_x86_64_ncprop279_1" -release_windows_x86_64_release_1_docker_builder: +release_windows_x86_64_release_nosign_docker_builder: timeout_in: 120m out_release_windows_x86_64_cache: folder: out @@ -1222,6 +1380,64 @@ release_windows_x86_64_release_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release windows x86_64 1" + binaries_artifacts: + path: "release/**/*" + env: + SIGN_BUILD: 0 + only_if: $CIRRUS_REPO_OWNER != "namecoin" + depends_on: + - "release_windows_x86_64_plain-binaries_1" + +release_windows_x86_64_release_sign_docker_builder: + timeout_in: 120m + out_release_windows_x86_64_cache: + folder: out + fingerprint_script: + - "echo out_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out" + out1_release_windows_x86_64_cache: + folder: out_cache1 + fingerprint_script: + - "echo out1_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1" + git_release_windows_x86_64_cache: + folder: git_clones + fingerprint_script: + - "echo git_release_windows_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p git_clones" + interrupted_aa_release_windows_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partaa.folder + fingerprint_script: + - "echo interrupted_aa_release_windows_x86_64" + reupload_on_changes: true + interrupted_ab_release_windows_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partab.folder + fingerprint_script: + - "echo interrupted_ab_release_windows_x86_64" + reupload_on_changes: true + interrupted_ac_release_windows_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partac.folder + fingerprint_script: + - "echo interrupted_ac_release_windows_x86_64" + reupload_on_changes: true + checkpoint_background_script: + - sleep 110m + - ./tools/container-interrupt.sh + build_script: + - "./tools/cirrus_build_project.sh release release windows x86_64 1" + binaries_artifacts: + path: "release/**/*" + only_if: $CIRRUS_REPO_OWNER == "namecoin" + env: + SIGN_BUILD: 1 + SIGN_KEY: ENCRYPTED[33d4594d76774e6447dfd9fabee90f6214b34e209fa1c1c2ce93ed1a40447a235b013b78afe85db52d5561651a821be1] + HOME: /root depends_on: - "release_windows_x86_64_plain-binaries_1" @@ -1309,6 +1525,8 @@ release_windows_i686_mingw-w64_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_download" @@ -1355,6 +1573,8 @@ release_windows_i686_mingw-w64_2_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh mingw-w64 release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_mingw-w64_1" @@ -1401,6 +1621,8 @@ release_windows_i686_goeasyconfig_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_mingw-w64_2" @@ -1447,6 +1669,8 @@ release_windows_i686_ncdns_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_goeasyconfig_1" @@ -1493,6 +1717,8 @@ release_windows_i686_ncp11_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_ncdns_1" @@ -1539,6 +1765,8 @@ release_windows_i686_ncprop279_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_ncp11_1" @@ -1585,10 +1813,63 @@ release_windows_i686_plain-binaries_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release windows i686 1" + env: + SIGN_BUILD: 0 depends_on: - "release_windows_i686_ncprop279_1" -release_windows_i686_release_1_docker_builder: +release_windows_i686_release_nosign_docker_builder: + timeout_in: 120m + out_release_windows_i686_cache: + folder: out + fingerprint_script: + - "echo out_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out" + out1_release_windows_i686_cache: + folder: out_cache1 + fingerprint_script: + - "echo out1_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1" + git_release_windows_i686_cache: + folder: git_clones + fingerprint_script: + - "echo git_release_windows_i686" + reupload_on_changes: true + populate_script: + - "mkdir -p git_clones" + interrupted_aa_release_windows_i686_cache: + folder: tmp/interrupted_dirs.tar.gz.partaa.folder + fingerprint_script: + - "echo interrupted_aa_release_windows_i686" + reupload_on_changes: true + interrupted_ab_release_windows_i686_cache: + folder: tmp/interrupted_dirs.tar.gz.partab.folder + fingerprint_script: + - "echo interrupted_ab_release_windows_i686" + reupload_on_changes: true + interrupted_ac_release_windows_i686_cache: + folder: tmp/interrupted_dirs.tar.gz.partac.folder + fingerprint_script: + - "echo interrupted_ac_release_windows_i686" + reupload_on_changes: true + checkpoint_background_script: + - sleep 110m + - ./tools/container-interrupt.sh + build_script: + - "./tools/cirrus_build_project.sh release release windows i686 1" + binaries_artifacts: + path: "release/**/*" + env: + SIGN_BUILD: 0 + only_if: $CIRRUS_REPO_OWNER != "namecoin" + depends_on: + - "release_windows_i686_plain-binaries_1" + +release_windows_i686_release_sign_docker_builder: timeout_in: 120m out_release_windows_i686_cache: folder: out @@ -1631,6 +1912,13 @@ release_windows_i686_release_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release windows i686 1" + binaries_artifacts: + path: "release/**/*" + only_if: $CIRRUS_REPO_OWNER == "namecoin" + env: + SIGN_BUILD: 1 + SIGN_KEY: ENCRYPTED[33d4594d76774e6447dfd9fabee90f6214b34e209fa1c1c2ce93ed1a40447a235b013b78afe85db52d5561651a821be1] + HOME: /root depends_on: - "release_windows_i686_plain-binaries_1" @@ -1718,6 +2006,8 @@ release_osx_x86_64_macosx-toolchain_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh macosx-toolchain release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_download" @@ -1764,6 +2054,8 @@ release_osx_x86_64_macosx-toolchain_2_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh macosx-toolchain release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_macosx-toolchain_1" @@ -1810,6 +2102,8 @@ release_osx_x86_64_goeasyconfig_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh goeasyconfig release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_macosx-toolchain_2" @@ -1856,6 +2150,8 @@ release_osx_x86_64_ncdns_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncdns release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_goeasyconfig_1" @@ -1902,6 +2198,8 @@ release_osx_x86_64_ncp11_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncp11 release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_ncdns_1" @@ -1948,6 +2246,8 @@ release_osx_x86_64_ncprop279_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh ncprop279 release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_ncp11_1" @@ -1994,10 +2294,63 @@ release_osx_x86_64_plain-binaries_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh plain-binaries release osx x86_64 1" + env: + SIGN_BUILD: 0 depends_on: - "release_osx_x86_64_ncprop279_1" -release_osx_x86_64_release_1_docker_builder: +release_osx_x86_64_release_nosign_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" + out1_release_osx_x86_64_cache: + folder: out_cache1 + fingerprint_script: + - "echo out1_release_osx_x86_64" + reupload_on_changes: true + populate_script: + - "mkdir -p out_cache1" + 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" + interrupted_aa_release_osx_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partaa.folder + fingerprint_script: + - "echo interrupted_aa_release_osx_x86_64" + reupload_on_changes: true + interrupted_ab_release_osx_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partab.folder + fingerprint_script: + - "echo interrupted_ab_release_osx_x86_64" + reupload_on_changes: true + interrupted_ac_release_osx_x86_64_cache: + folder: tmp/interrupted_dirs.tar.gz.partac.folder + fingerprint_script: + - "echo interrupted_ac_release_osx_x86_64" + reupload_on_changes: true + checkpoint_background_script: + - sleep 110m + - ./tools/container-interrupt.sh + build_script: + - "./tools/cirrus_build_project.sh release release osx x86_64 1" + binaries_artifacts: + path: "release/**/*" + env: + SIGN_BUILD: 0 + only_if: $CIRRUS_REPO_OWNER != "namecoin" + depends_on: + - "release_osx_x86_64_plain-binaries_1" + +release_osx_x86_64_release_sign_docker_builder: timeout_in: 120m out_release_osx_x86_64_cache: folder: out @@ -2040,6 +2393,13 @@ release_osx_x86_64_release_1_docker_builder: - ./tools/container-interrupt.sh build_script: - "./tools/cirrus_build_project.sh release release osx x86_64 1" + binaries_artifacts: + path: "release/**/*" + only_if: $CIRRUS_REPO_OWNER == "namecoin" + env: + SIGN_BUILD: 1 + SIGN_KEY: ENCRYPTED[33d4594d76774e6447dfd9fabee90f6214b34e209fa1c1c2ce93ed1a40447a235b013b78afe85db52d5561651a821be1] + HOME: /root depends_on: - "release_osx_x86_64_plain-binaries_1" diff --git a/projects/plain-binaries/build b/projects/plain-binaries/build index 649ce69..936d915 100644 --- a/projects/plain-binaries/build +++ b/projects/plain-binaries/build @@ -11,5 +11,5 @@ tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncprop279') %] cd $distdir [% c('tar', { tar_src => [ '.' ], - tar_args => '-czf ' _ dest_dir _ '/' _ c('filename'), + tar_args => '-cJf ' _ dest_dir _ '/' _ c('filename'), }) %] diff --git a/projects/plain-binaries/config b/projects/plain-binaries/config index 8f54a05..1d82b05 100644 --- a/projects/plain-binaries/config +++ b/projects/plain-binaries/config @@ -1,5 +1,5 @@ version: '[% c("var/ncdns_version") %]' -filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' +filename: 'ncdns-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.xz' var: container: diff --git a/rbm.conf b/rbm.conf index cd2f037..103dcbe 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,7 +24,7 @@ buildconf: git_signtag_opt: '-s' var: - ncdns_version: '10.5a10' + ncdns_version: '[% pc("ncdns", "version") %]' ncdns_build: 'build1' ncdns_incremental_from: - 10.5a8 diff --git a/tools/cirrus_build_project.sh b/tools/cirrus_build_project.sh index a20b447..748d689 100755 --- a/tools/cirrus_build_project.sh +++ b/tools/cirrus_build_project.sh @@ -61,6 +61,15 @@ fi #df -h if [[ "$SHOULD_BUILD" -eq 1 ]]; then + if [[ "$SIGN_BUILD" == "1" ]]; then + echo "Configuring signing key..." + export RBM_SIGN_BUILD=1 + export RBM_GPG_OPTS="--local-user jeremy@namecoin.org" + echo "$SIGN_KEY" | gpg --import + else + echo "Signing is disabled." + fi + echo "Building project..." # If rbm fails, we consider it a success as long as it saved a checkpoint. ./rbm/rbm build "$PROJECT" --target "$CHANNEL" --target ncdns-"$OS"-"$ARCH" || [ ! -z "$(ls -A ./tmp/interrupted_dirs/)" ] diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh index c7822e9..ed6f137 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -51,7 +51,7 @@ print_os_arch () { echo "" # TODO fine-tune this list - for PROJECT in compiler.1 compiler.2 goeasyconfig.1 ncdns.1 ncp11.1 ncprop279.1 plain-binaries.1 release.1; do + for PROJECT in compiler.1 compiler.2 goeasyconfig.1 ncdns.1 ncp11.1 ncprop279.1 plain-binaries.1 release.nosign release.sign; do PROJECT_BASE=$(echo $PROJECT | cut -d . -f 1) if [[ "$PROJECT_BASE" == "compiler" ]]; then if [[ "$OS" == "android" ]]; then @@ -112,6 +112,25 @@ print_os_arch () { build_script: - \"./tools/cirrus_build_project.sh ${PROJECT_BASE} ${CHANNEL} ${OS} ${ARCH} 1\"" + if [[ "$PROJECT_BASE" == "release" ]]; then + echo " binaries_artifacts: + path: \"${CHANNEL}/**/*\"" + fi + + if [[ "$PROJECT_ITER" == "sign" ]]; then + echo ' only_if: $CIRRUS_REPO_OWNER == "namecoin"' + echo " env: + SIGN_BUILD: 1 + SIGN_KEY: ENCRYPTED[33d4594d76774e6447dfd9fabee90f6214b34e209fa1c1c2ce93ed1a40447a235b013b78afe85db52d5561651a821be1] + HOME: /root" + else + echo " env: + SIGN_BUILD: 0" + fi + if [[ "$PROJECT_ITER" == "nosign" ]]; then + echo ' only_if: $CIRRUS_REPO_OWNER != "namecoin"' + fi + # Depend on previous project if [[ "$PROJECT" == "compiler.1" ]]; then echo " depends_on: @@ -121,8 +140,10 @@ print_os_arch () { - \"${CHANNEL}_${OS}_${ARCH}_${PREV_PROJECT_BASE}_${PREV_PROJECT_ITER}\"" fi - local PREV_PROJECT_BASE="$PROJECT_BASE" - local PREV_PROJECT_ITER="$PROJECT_ITER" + if [[ "$PROJECT_ITER" != "nosign" ]]; then + local PREV_PROJECT_BASE="$PROJECT_BASE" + local PREV_PROJECT_ITER="$PROJECT_ITER" + fi echo "" done }