From 5da7eaea9389e3f81a22b7ac1d0e607603dbb43a Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 8 Sep 2021 01:58:06 +0000 Subject: [PATCH 1/2] plain-binaries: Disable ncp11 on macOS Refs https://github.com/namecoin/ncdns-repro/issues/155 --- projects/plain-binaries/build | 4 +++- projects/plain-binaries/config | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/projects/plain-binaries/build b/projects/plain-binaries/build index c7c4461..fc6edd5 100644 --- a/projects/plain-binaries/build +++ b/projects/plain-binaries/build @@ -10,7 +10,9 @@ mkdir -p $distdir tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/encaya') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/generate_nmc_cert') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncdns') %] -tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncp11') %] +[% IF ! c("var/osx") %] + tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncp11') %] +[% END %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/ncprop279') %] tar -C /var/tmp/dist/[% project %] -xf [% c('input_files_by_name/q') %] diff --git a/projects/plain-binaries/config b/projects/plain-binaries/config index 4d62423..b624ace 100644 --- a/projects/plain-binaries/config +++ b/projects/plain-binaries/config @@ -18,6 +18,7 @@ input_files: project: ncdns - name: ncp11 project: ncp11 + enable: '[% ! c("var/osx") %]' - name: ncprop279 project: ncprop279 - name: q From 05e3315d9ca9d4db0b2baee0c30650a17588c943 Mon Sep 17 00:00:00 2001 From: Jeremy Rand Date: Wed, 8 Sep 2021 02:09:01 +0000 Subject: [PATCH 2/2] Cirrus: Remove ncp11 tasks On Windows+Linux, they will be absorbed into plain-binaries; on macOS, ncp11 builds are suspended. Refs https://github.com/namecoin/ncdns-repro/issues/155 --- .cirrus.yml | 380 +--------------------------------------- tools/cirrus_gen_yml.sh | 2 +- 2 files changed, 6 insertions(+), 376 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index aaba221..46d2d23 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -361,80 +361,6 @@ release_linux_x86_64_ncdns_1_docker_builder: depends_on: - "release_linux_x86_64_goeasyconfig_1" -release_linux_x86_64_ncp11_1_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" - out2_release_linux_x86_64_cache: - folder: out_cache2 - fingerprint_script: - - "echo out2_release_linux_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache2" - out3_release_linux_x86_64_cache: - folder: out_cache3 - fingerprint_script: - - "echo out3_release_linux_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache3" - 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" - gitindex_release_linux_x86_64_cache: - folder: git_index - fingerprint_script: - - "echo gitindex_release_linux_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p git_index" - 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: - # 110m caused the 2hr task timeout to be hit while the cache was uploading - # for macosx-toolchain, which broke subsequent builds. - - sleep 105m - - ./tools/container-interrupt.sh - build_script: - - "./tools/cirrus_build_project.sh ncp11 release linux x86_64 1" - env: - SIGN_BUILD: 0 - env: - CIRRUS_LOG_TIMESTAMP: true - BUMP_DEPS: 0 - depends_on: - - "release_linux_x86_64_ncdns_1" - release_linux_x86_64_ncprop279_1_docker_builder: timeout_in: 120m out_release_linux_x86_64_cache: @@ -507,7 +433,7 @@ release_linux_x86_64_ncprop279_1_docker_builder: CIRRUS_LOG_TIMESTAMP: true BUMP_DEPS: 0 depends_on: - - "release_linux_x86_64_ncp11_1" + - "release_linux_x86_64_ncdns_1" release_linux_x86_64_plain-binaries_1_docker_builder: timeout_in: 120m @@ -1100,80 +1026,6 @@ release_linux_i686_ncdns_1_docker_builder: depends_on: - "release_linux_i686_goeasyconfig_1" -release_linux_i686_ncp11_1_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" - out2_release_linux_i686_cache: - folder: out_cache2 - fingerprint_script: - - "echo out2_release_linux_i686" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache2" - out3_release_linux_i686_cache: - folder: out_cache3 - fingerprint_script: - - "echo out3_release_linux_i686" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache3" - 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" - gitindex_release_linux_i686_cache: - folder: git_index - fingerprint_script: - - "echo gitindex_release_linux_i686" - reupload_on_changes: true - populate_script: - - "mkdir -p git_index" - 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: - # 110m caused the 2hr task timeout to be hit while the cache was uploading - # for macosx-toolchain, which broke subsequent builds. - - sleep 105m - - ./tools/container-interrupt.sh - build_script: - - "./tools/cirrus_build_project.sh ncp11 release linux i686 1" - env: - SIGN_BUILD: 0 - env: - CIRRUS_LOG_TIMESTAMP: true - BUMP_DEPS: 0 - depends_on: - - "release_linux_i686_ncdns_1" - release_linux_i686_ncprop279_1_docker_builder: timeout_in: 120m out_release_linux_i686_cache: @@ -1246,7 +1098,7 @@ release_linux_i686_ncprop279_1_docker_builder: CIRRUS_LOG_TIMESTAMP: true BUMP_DEPS: 0 depends_on: - - "release_linux_i686_ncp11_1" + - "release_linux_i686_ncdns_1" release_linux_i686_plain-binaries_1_docker_builder: timeout_in: 120m @@ -1839,80 +1691,6 @@ release_windows_x86_64_ncdns_1_docker_builder: depends_on: - "release_windows_x86_64_goeasyconfig_1" -release_windows_x86_64_ncp11_1_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" - out2_release_windows_x86_64_cache: - folder: out_cache2 - fingerprint_script: - - "echo out2_release_windows_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache2" - out3_release_windows_x86_64_cache: - folder: out_cache3 - fingerprint_script: - - "echo out3_release_windows_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache3" - 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" - gitindex_release_windows_x86_64_cache: - folder: git_index - fingerprint_script: - - "echo gitindex_release_windows_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p git_index" - 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: - # 110m caused the 2hr task timeout to be hit while the cache was uploading - # for macosx-toolchain, which broke subsequent builds. - - sleep 105m - - ./tools/container-interrupt.sh - build_script: - - "./tools/cirrus_build_project.sh ncp11 release windows x86_64 1" - env: - SIGN_BUILD: 0 - env: - CIRRUS_LOG_TIMESTAMP: true - BUMP_DEPS: 0 - depends_on: - - "release_windows_x86_64_ncdns_1" - release_windows_x86_64_ncprop279_1_docker_builder: timeout_in: 120m out_release_windows_x86_64_cache: @@ -1985,7 +1763,7 @@ release_windows_x86_64_ncprop279_1_docker_builder: CIRRUS_LOG_TIMESTAMP: true BUMP_DEPS: 0 depends_on: - - "release_windows_x86_64_ncp11_1" + - "release_windows_x86_64_ncdns_1" release_windows_x86_64_plain-binaries_1_docker_builder: timeout_in: 120m @@ -2578,80 +2356,6 @@ release_windows_i686_ncdns_1_docker_builder: depends_on: - "release_windows_i686_goeasyconfig_1" -release_windows_i686_ncp11_1_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" - out2_release_windows_i686_cache: - folder: out_cache2 - fingerprint_script: - - "echo out2_release_windows_i686" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache2" - out3_release_windows_i686_cache: - folder: out_cache3 - fingerprint_script: - - "echo out3_release_windows_i686" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache3" - 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" - gitindex_release_windows_i686_cache: - folder: git_index - fingerprint_script: - - "echo gitindex_release_windows_i686" - reupload_on_changes: true - populate_script: - - "mkdir -p git_index" - 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: - # 110m caused the 2hr task timeout to be hit while the cache was uploading - # for macosx-toolchain, which broke subsequent builds. - - sleep 105m - - ./tools/container-interrupt.sh - build_script: - - "./tools/cirrus_build_project.sh ncp11 release windows i686 1" - env: - SIGN_BUILD: 0 - env: - CIRRUS_LOG_TIMESTAMP: true - BUMP_DEPS: 0 - depends_on: - - "release_windows_i686_ncdns_1" - release_windows_i686_ncprop279_1_docker_builder: timeout_in: 120m out_release_windows_i686_cache: @@ -2724,7 +2428,7 @@ release_windows_i686_ncprop279_1_docker_builder: CIRRUS_LOG_TIMESTAMP: true BUMP_DEPS: 0 depends_on: - - "release_windows_i686_ncp11_1" + - "release_windows_i686_ncdns_1" release_windows_i686_plain-binaries_1_docker_builder: timeout_in: 120m @@ -3317,80 +3021,6 @@ release_osx_x86_64_ncdns_1_docker_builder: depends_on: - "release_osx_x86_64_goeasyconfig_1" -release_osx_x86_64_ncp11_1_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" - out2_release_osx_x86_64_cache: - folder: out_cache2 - fingerprint_script: - - "echo out2_release_osx_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache2" - out3_release_osx_x86_64_cache: - folder: out_cache3 - fingerprint_script: - - "echo out3_release_osx_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p out_cache3" - 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" - gitindex_release_osx_x86_64_cache: - folder: git_index - fingerprint_script: - - "echo gitindex_release_osx_x86_64" - reupload_on_changes: true - populate_script: - - "mkdir -p git_index" - 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: - # 110m caused the 2hr task timeout to be hit while the cache was uploading - # for macosx-toolchain, which broke subsequent builds. - - sleep 105m - - ./tools/container-interrupt.sh - build_script: - - "./tools/cirrus_build_project.sh ncp11 release osx x86_64 1" - env: - SIGN_BUILD: 0 - env: - CIRRUS_LOG_TIMESTAMP: true - BUMP_DEPS: 0 - depends_on: - - "release_osx_x86_64_ncdns_1" - release_osx_x86_64_ncprop279_1_docker_builder: timeout_in: 120m out_release_osx_x86_64_cache: @@ -3463,7 +3093,7 @@ release_osx_x86_64_ncprop279_1_docker_builder: CIRRUS_LOG_TIMESTAMP: true BUMP_DEPS: 0 depends_on: - - "release_osx_x86_64_ncp11_1" + - "release_osx_x86_64_ncdns_1" release_osx_x86_64_plain-binaries_1_docker_builder: timeout_in: 120m diff --git a/tools/cirrus_gen_yml.sh b/tools/cirrus_gen_yml.sh index 4c3d0ca..6373e5a 100755 --- a/tools/cirrus_gen_yml.sh +++ b/tools/cirrus_gen_yml.sh @@ -75,7 +75,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.nosign release.sign; do + for PROJECT in compiler.1 compiler.2 goeasyconfig.1 ncdns.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