travis: use only travis jobs: instead of mix of jobs+matrix #13849

pull scravy wants to merge 1 commits into bitcoin:master from scravy:travis-migrate-matrix-to-jobs-stages changing 1 files +58 −53
  1. scravy commented at 10:39 am on August 2, 2018: contributor

    This is extracted from #13816 to make that one simpler.

    The travis matrix and jobs top level items are actually aliases for each other. The goal is to be able to specify not just the environment per job but also the os (for #13816 ). So this PR moves the environment variables from the env.matrix section to jobs.include.

    jobs and build stages subsume the matrix functionality. IMHO this makes it clearer to add stages (as every item clearly references which stage it belongs to).

    The before_install, install, etc. steps default to belonging to the test stage and were moved up .

  2. scravy renamed this:
    use only travis jobs: instead of mix of jobs+matrix
    travis: use only travis jobs: instead of mix of jobs+matrix
    on Aug 2, 2018
  3. scravy force-pushed on Aug 2, 2018
  4. fanquake added the label Tests on Aug 2, 2018
  5. fanquake requested review from MarcoFalke on Aug 2, 2018
  6. scravy commented at 1:18 pm on August 2, 2018: contributor
    The script/install block was moved as it was in the middle of the jobs section now. It was moved as is.
  7. in .travis.yml:78 in dfad9c6616 outdated
    76         DEP_OPTS="NO_QT=1"
    77         GOAL="install"
    78         BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
    79-# Win32
    80-    - >-
    81+ # Win32
    


    MarcoFalke commented at 1:21 pm on August 2, 2018:
    unrelated whitspace change

    scravy commented at 1:34 pm on August 2, 2018:
    fixed
  8. in .travis.yml:63 in dfad9c6616 outdated
    42+    - BEGIN_FOLD distdir; DOCKER_EXEC make distdir VERSION=$HOST; END_FOLD
    43+    - cd bitcoin-$HOST
    44+    - BEGIN_FOLD configure; DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD
    45+    - BEGIN_FOLD build; DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ); END_FOLD
    46+    - if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi
    47+    - if [ "$TRAVIS_EVENT_TYPE" = "cron" ]; then extended="--extended --exclude feature_pruning,feature_dbcrash"; fi
    


    MarcoFalke commented at 1:22 pm on August 2, 2018:
    unrelated removal of the bench_bitcoin

    scravy commented at 1:28 pm on August 2, 2018:
    good spot. I though I had kept an eye on that, but the most recent rebase swallowed it :-X
  9. MarcoFalke dismissed
  10. scravy force-pushed on Aug 2, 2018
  11. in .travis.yml:62 in 116164e480 outdated
    58+    - BEGIN_FOLD distdir; DOCKER_EXEC make distdir VERSION=$HOST; END_FOLD
    59+    - cd bitcoin-$HOST
    60+    - BEGIN_FOLD configure; DOCKER_EXEC ./configure --cache-file=../config.cache $BITCOIN_CONFIG_ALL $BITCOIN_CONFIG || ( cat config.log && false); END_FOLD
    61+    - BEGIN_FOLD build; DOCKER_EXEC make $MAKEJOBS $GOAL || ( echo "Build failure. Verbose build follows." && DOCKER_EXEC make $GOAL V=1 ; false ); END_FOLD
    62+    - if [ "$RUN_TESTS" = "true" ]; then BEGIN_FOLD unit-tests; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib make $MAKEJOBS check VERBOSE=1; END_FOLD; fi
    63+    - if [ "$RUN_BENCH" = "true" ]; then BEGIN_FOLD bench; DOCKER_EXEC LD_LIBRARY_PATH=$TRAVIS_BUILD_DIR/depends/$HOST/lib $OUTDIR/bin/bench_bitcoin -scaling=0.001 ; END_FOLD; fi  
    


    scravy commented at 1:32 pm on August 2, 2018:
    @MarcoFalke the bench is back
  12. scravy force-pushed on Aug 2, 2018
  13. in .travis.yml:142 in be4b54d7a4 outdated
    184-    - echo $TRAVIS_COMMIT_RANGE
    185-    - echo $TRAVIS_COMMIT_LOG
    186-
    187-jobs:
    188-  include:
    189+        BITCOIN_CONFIG="--enable-gui --enable-reduce-exports --enable-werror"
    


    scravy commented at 1:33 pm on August 2, 2018:
    I moved this line to keep BITCOIN_CONFIG in the same relative spot as in all the other jobs.
  14. use only travis jobs: instead of mix of jobs+matrix 566f826902
  15. scravy force-pushed on Aug 2, 2018
  16. MarcoFalke commented at 2:30 pm on August 2, 2018: member
    utACK 566f826902
  17. DrahtBot commented at 6:44 pm on August 2, 2018: member
    • #13859 (qa: Add emojis to test_runner path and wallet filename by MarcoFalke)
    • #13855 (travis: upload binaries by ken2812221)

    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.

  18. promag commented at 11:38 am on August 3, 2018: member
    ACK 566f826. Verified the moved parts with git diff --color-moved=dimmed_zebra -w head^. Travis builds LGTM.
  19. MarcoFalke merged this on Aug 3, 2018
  20. MarcoFalke closed this on Aug 3, 2018

  21. MarcoFalke referenced this in commit 2b67354aa5 on Aug 3, 2018
  22. scravy deleted the branch on Aug 3, 2018
  23. MarcoFalke referenced this in commit ca4510c15d on Aug 27, 2018
  24. Munkybooty referenced this in commit e1e77958ce on Jun 30, 2021
  25. Munkybooty referenced this in commit 17362b8fd4 on Jul 1, 2021
  26. Munkybooty referenced this in commit a3a381b28b on Jul 1, 2021
  27. Munkybooty referenced this in commit a872c78836 on Jul 2, 2021
  28. Munkybooty referenced this in commit 251ce629e7 on Jul 2, 2021
  29. Munkybooty referenced this in commit a33cfb7c92 on Jul 4, 2021
  30. UdjinM6 referenced this in commit 50d8d8023e on Jul 7, 2021
  31. Munkybooty referenced this in commit 9d9efce3f4 on Jul 7, 2021
  32. UdjinM6 referenced this in commit 77bbcd9612 on Jul 7, 2021
  33. Munkybooty referenced this in commit 1ba72e6323 on Jul 7, 2021
  34. Munkybooty referenced this in commit 4c2211dd41 on Jul 8, 2021
  35. Munkybooty referenced this in commit 8e25e2f0fe on Jul 8, 2021
  36. MarcoFalke locked this on Sep 8, 2021

github-metadata-mirror

This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2024-11-17 12:12 UTC

This site is hosted by @0xB10C
More mirrored repositories can be found on mirror.b10c.me