ci: Run more ci configs on cirrus #20339

pull MarcoFalke wants to merge 5 commits into bitcoin:master from MarcoFalke:2011-moreCirrus changing 9 files +70 −49

MarcoFalke commented at 12:15 PM on November 8, 2020: member

No description provided.
MarcoFalke force-pushed on Nov 8, 2020
fanquake added the label Tests on Nov 8, 2020
DrahtBot commented at 3:24 PM on November 8, 2020: member


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #20182 (ci: Enable -Werror for Travis builds, and document exceptions by hebasto)
- #19179 ([WIP RFC DONOTMERGE] ci: Run ci configs on cirrus by MarcoFalke)
- #18077 (net: Add NAT-PMP port forwarding support by hebasto)
- #17227 (Qt: Add Android packaging support by icota)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
hebasto commented at 4:11 AM on November 9, 2020: member

Concept ACK, it seems split from #19179.

Could pr title and/or description mention arm build as well?
in ci/test/00_setup_env_mac_host.sh:13 in facea56bb3 outdated
```
   9 | @@ -10,6 +10,7 @@ export HOST=x86_64-apple-darwin16
  10 |  export PIP_PACKAGES="zmq"
  11 |  export GOAL="install"
  12 |  export BITCOIN_CONFIG="--with-gui --enable-reduce-exports --enable-werror --with-boost-process"
  13 | +export CI_OS_NAME="osx"
```
hebasto commented at 4:41 AM on November 9, 2020:

facea56bb331b51805336ce24cf22df52757882a

nit: While providing a new custom environment variable, maybe choose a better value:

export CI_OS_NAME="macos"

?
MarcoFalke commented at 9:20 AM on November 9, 2020:

thx, changes osx->macos

in .cirrus.yml:57 in faf07014b9 outdated

  52 | @@ -53,6 +53,14 @@ global_task_template: &GLOBAL_TASK_TEMPLATE
  53 |  #  install_script:
  54 |  #    - choco install python --version=3.7.7 -y
  55 |  
  56 | +task:
  57 | +  name: 'ARM  [GOAL: install]  [buster]  [unit tests, no functional tests]'

hebasto commented at 5:01 AM on November 9, 2020:

faf07014b9c166692ca2bab10695f00a90990027, nit:

  name: 'ARM  [GOAL: install]  [buster]  [unit tests in QEMU, no functional tests]'

in .cirrus.yml:142 in fafc0158f9 outdated

 134 | @@ -135,3 +135,17 @@ task:
 135 |      image: ubuntu:bionic
 136 |    env:
 137 |      FILE_ENV: "./ci/test/00_setup_env_mac.sh"
 138 | +
 139 | +task:
 140 | +  name: 'macOS 10.14 native [GOAL: install] [GUI] [no depends]'
 141 | +  macos_brew_addon_script:
 142 | +    - brew install boost libevent berkeley-db4 qt miniupnpc qrencode sqlite ccache zeromq qrencode sqlite libtool automake pkg-config coreutils gnu-getopt

hebasto commented at 5:17 AM on November 9, 2020:

fafc0158f99d90078223461631ef2829bd5fcec6

The qrencode and sqlite packages are mentioned twice :)

Why the coreutils and gnu-getopt packages are required (comparing to doc/build-osx.md)?

MarcoFalke commented at 9:22 AM on November 9, 2020:

thanks removed duplicate packets.

getopt is needed for IN_GETOPT_BIN="/usr/local/opt/gnu-getopt/bin/getopt" in the same commit

hebasto changes_requested
hebasto commented at 5:19 AM on November 9, 2020: member

Approach ACK fafc0158f99d90078223461631ef2829bd5fcec6.
MarcoFalke renamed this:
~~ci: Run macos ci config on cirrus~~
ci: Run more ci configs on cirrus
on Nov 9, 2020
ci: Move documentation to correct config file fafce1a13a
ci: Replace TRAVIS_OS_NAME with CI_OS_NAME
Also enable free disk space check unconditionally
fa0795f54d
ci: Run arm ci config on cirrus fa8b1114e6
ci: Run macos ci config on cirrus 3333d6942e
ci: Run windows ci config on cirrus 77777c8b5e
MarcoFalke force-pushed on Nov 9, 2020
hebasto approved
hebasto commented at 12:27 PM on November 9, 2020: member

ACK 77777c8b5e3d0edbe1178d982a778b7cc9964b70

Does the latest commit 77777c8b5e3d0edbe1178d982a778b7cc9964b70 keeps compatibility with Travis CI?
MarcoFalke commented at 2:08 PM on November 9, 2020: member

Yes, see https://travis-ci.org/github/bitcoin/bitcoin/builds/742437881
MarcoFalke force-pushed on Nov 9, 2020
MarcoFalke merged this on Nov 9, 2020
MarcoFalke closed this on Nov 9, 2020
MarcoFalke deleted the branch on Nov 9, 2020
sidhujag referenced this in commit 04912314cb on Nov 9, 2020
DrahtBot locked this on Feb 15, 2022

Contributors

Labels

ci: Run more ci configs on cirrus #20339

Conflicts