Skip to content

Conversation

@scravy
Copy link
Contributor

@scravy scravy commented Aug 2, 2018

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 .

@scravy scravy changed the title use only travis jobs: instead of mix of jobs+matrix travis: use only travis jobs: instead of mix of jobs+matrix Aug 2, 2018
@scravy scravy force-pushed the travis-migrate-matrix-to-jobs-stages branch from 4d3bbcc to dfad9c6 Compare August 2, 2018 12:16
@fanquake fanquake added the Tests label Aug 2, 2018
@fanquake fanquake requested a review from maflcko August 2, 2018 12:25
@scravy
Copy link
Contributor Author

scravy commented Aug 2, 2018

The script/install block was moved as it was in the middle of the jobs section now. It was moved as is.

maflcko
maflcko previously requested changes Aug 2, 2018
.travis.yml Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated whitspace change

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fixed

.travis.yml Outdated
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated removal of the bench_bitcoin

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good spot. I though I had kept an eye on that, but the most recent rebase swallowed it :-X

@scravy scravy force-pushed the travis-migrate-matrix-to-jobs-stages branch from dfad9c6 to 116164e Compare August 2, 2018 13:31
.travis.yml Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MarcoFalke the bench is back

@scravy scravy force-pushed the travis-migrate-matrix-to-jobs-stages branch from 116164e to be4b54d Compare August 2, 2018 13:33
.travis.yml Outdated
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I moved this line to keep BITCOIN_CONFIG in the same relative spot as in all the other jobs.

@scravy scravy force-pushed the travis-migrate-matrix-to-jobs-stages branch from be4b54d to 566f826 Compare August 2, 2018 13:36
@maflcko maflcko dismissed their stale review August 2, 2018 14:30

utACK

@maflcko
Copy link
Member

maflcko commented Aug 2, 2018

utACK 566f826

@DrahtBot
Copy link
Contributor

DrahtBot commented Aug 2, 2018

Note to reviewers: This pull request conflicts with the following ones:

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.

@promag
Copy link
Contributor

promag commented Aug 3, 2018

ACK 566f826. Verified the moved parts with git diff --color-moved=dimmed_zebra -w head^. Travis builds LGTM.

@maflcko maflcko merged commit 566f826 into bitcoin:master Aug 3, 2018
maflcko pushed a commit that referenced this pull request Aug 3, 2018
…trix

566f826 use only travis jobs: instead of mix of jobs+matrix (Julian Fleischer)

Pull request description:

  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 .

Tree-SHA512: afd01e03d076c3ac6c2ab20facbe0fbbbc028c92880d02e866b077e9ca365a4e9e8c237a0d999234180c684bc4612c0bf6c3026b96d93b5f91c7e60e4de7775e
@scravy scravy deleted the travis-migrate-matrix-to-jobs-stages branch August 3, 2018 13:43
maflcko pushed a commit that referenced this pull request Aug 27, 2018
…ject to shellcheck

4143269 use export LC_ALL=C.UTF-8 (Julian Fleischer)
728c82d make script exit if a command fails (Julian Fleischer)
506890b move remaining travis build steps into individual files (Julian Fleischer)
272306e number .travis/ script according to build lifecycle and add README to explain (Julian Fleischer)
519e273 move lint stage up to resemble travis build ui (Julian Fleischer)
86d34f0 abort script in END_FOLD on non-zero exit code (Julian Fleischer)
4f2f88c move script sections info individual files and comply with shellcheck (Julian Fleischer)

Pull request description:

  This PR is extracted from #13816 to make that one easier to review. It follows on #13849 and #13851

  In here the shell script parts from `travis.yml` are extracted into `.travis/before_install.sh`, `.travis/install.sh`, `.travis/before_script.sh`, `.travis/script.sh`, and `.travis/lint.sh`.

  This has the benefit that `test/lint/lint-shell.sh` will also shellcheck these parts. Also it makes the individual script parts more readable.

Tree-SHA512: c497e1687ceb1c1d795de177d3fc35af908bc8e3f781a871afabdecf031e581d4db229290627249e35ef7c09952bc34884e4734ea91d40f57b4a9efb85bba2e3
UdjinM6 pushed a commit to UdjinM6/dash that referenced this pull request Jul 7, 2021
… `.travis/` subject to shellcheck

4143269 use export LC_ALL=C.UTF-8 (Julian Fleischer)
728c82d make script exit if a command fails (Julian Fleischer)
506890b move remaining travis build steps into individual files (Julian Fleischer)
272306e number .travis/ script according to build lifecycle and add README to explain (Julian Fleischer)
519e273 move lint stage up to resemble travis build ui (Julian Fleischer)
86d34f0 abort script in END_FOLD on non-zero exit code (Julian Fleischer)
4f2f88c move script sections info individual files and comply with shellcheck (Julian Fleischer)

Pull request description:

  This PR is extracted from bitcoin#13816 to make that one easier to review. It follows on bitcoin#13849 and bitcoin#13851

  In here the shell script parts from `travis.yml` are extracted into `.travis/before_install.sh`, `.travis/install.sh`, `.travis/before_script.sh`, `.travis/script.sh`, and `.travis/lint.sh`.

  This has the benefit that `test/lint/lint-shell.sh` will also shellcheck these parts. Also it makes the individual script parts more readable.

Tree-SHA512: c497e1687ceb1c1d795de177d3fc35af908bc8e3f781a871afabdecf031e581d4db229290627249e35ef7c09952bc34884e4734ea91d40f57b4a9efb85bba2e3
Munkybooty pushed a commit to Munkybooty/dash that referenced this pull request Jul 8, 2021
… `.travis/` subject to shellcheck

4143269 use export LC_ALL=C.UTF-8 (Julian Fleischer)
728c82d make script exit if a command fails (Julian Fleischer)
506890b move remaining travis build steps into individual files (Julian Fleischer)
272306e number .travis/ script according to build lifecycle and add README to explain (Julian Fleischer)
519e273 move lint stage up to resemble travis build ui (Julian Fleischer)
86d34f0 abort script in END_FOLD on non-zero exit code (Julian Fleischer)
4f2f88c move script sections info individual files and comply with shellcheck (Julian Fleischer)

Pull request description:

  This PR is extracted from bitcoin#13816 to make that one easier to review. It follows on bitcoin#13849 and bitcoin#13851

  In here the shell script parts from `travis.yml` are extracted into `.travis/before_install.sh`, `.travis/install.sh`, `.travis/before_script.sh`, `.travis/script.sh`, and `.travis/lint.sh`.

  This has the benefit that `test/lint/lint-shell.sh` will also shellcheck these parts. Also it makes the individual script parts more readable.

Tree-SHA512: c497e1687ceb1c1d795de177d3fc35af908bc8e3f781a871afabdecf031e581d4db229290627249e35ef7c09952bc34884e4734ea91d40f57b4a9efb85bba2e3
@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants