Skip to content

test: Rework ci (Use travis only as fallback env)#16582

Merged
maflcko merged 5 commits intobitcoin:masterfrom
maflcko:1908-ciRework
Aug 15, 2019
Merged

test: Rework ci (Use travis only as fallback env)#16582
maflcko merged 5 commits intobitcoin:masterfrom
maflcko:1908-ciRework

Conversation

@maflcko
Copy link
Member

@maflcko maflcko commented Aug 10, 2019

This moves the .travis folder to ci and removes dependence on travis, so that the test script can be run anywhere.

@practicalswift
Copy link
Contributor

@MarcoFalke Could you provide some additional context? With this PR merged tests would still run in both Appveyor and Travis, right? What is the plan? :-)

@maflcko
Copy link
Member Author

maflcko commented Aug 11, 2019

The plan is to be flexible, to be able to switch away from travis any time without much hassle. Also, this makes it easier to run the ci locally.

@maflcko maflcko force-pushed the 1908-ciRework branch 2 times, most recently from 3c99346 to d6230c8 Compare August 11, 2019 13:47
@promag
Copy link
Contributor

promag commented Aug 11, 2019

Concept ACK.

@maflcko maflcko force-pushed the 1908-ciRework branch 5 times, most recently from 2dfc5d8 to 472aadb Compare August 11, 2019 14:15
@maflcko maflcko removed the Docs label Aug 11, 2019
@maflcko maflcko force-pushed the 1908-ciRework branch 8 times, most recently from faf7c0a to fa88a5f Compare August 11, 2019 15:13
@maflcko
Copy link
Member Author

maflcko commented Aug 11, 2019

Fixed typo in doc and added a note on how to run the ci locally

@maflcko maflcko force-pushed the 1908-ciRework branch 7 times, most recently from 4e0c757 to f1a0571 Compare August 11, 2019 16:41
@fanquake
Copy link
Member

I'm now seeing an error running this:

configure.ac:40: installing 'build-aux/missing'
src/Makefile.am: installing 'build-aux/depcomp'
travis_fold:end:autogen

travis_fold:start:configure
configure: loading site script /Users/michael/github/bitcoin/depends/x86_64-unknown-linux-gnu/share/config.site
configure: loading cache config.cache
checking build system type... x86_64-pc-linux-gnu
checking host system type... x86_64-unknown-linux-gnu
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for x86_64-unknown-linux-gnu-strip... no
checking for strip... strip
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether make supports nested variables... yes
configure: error: source directory already configured; run "make distclean" there first
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.

It was created by Bitcoin Core configure 0.18.99, which was
generated by GNU Autoconf 2.69.  Invocation command line was

  $ ../configure --cache-file=config.cache --disable-dependency-tracking --prefix=/Users/michael/github/bitcoin/depends/x86_64-unknown-linux-gnu --bindir=/Users/michael/github/bitcoin/out/x86_64-unknown-linux-gnu/bin --libdir=/Users/michael/github/bitcoin/out/x86_64-unknown-linux-gnu/lib

@maflcko
Copy link
Member Author

maflcko commented Aug 15, 2019

It says source directory already configured; run "make distclean" there first. Have you tried that?

@maflcko
Copy link
Member Author

maflcko commented Aug 15, 2019

Specifically cd /Users/michael/github/bitcoin && make distclean.

The ci is generally assuming the the folder is a fresh git clone. If needed, that can be changed later on, but better not part of this pull.

@fanquake
Copy link
Member

It says source directory already configured; run "make distclean" there first. Have you tried that?

Shouldn't that all be handled by the script? If not, then some docs about why you can't run the tests twice in a row would be handy.

@maflcko
Copy link
Member Author

maflcko commented Aug 15, 2019

Done

Copy link
Member

@fanquake fanquake left a comment

Choose a reason for hiding this comment

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

Thanks ACK fa9404d76d16c618dbd2c19973246900918f9e6c - Maybe @sipsorcery or @NicolasDorier might also want to test here, then we'd have all OS's covered?

@maflcko
Copy link
Member Author

maflcko commented Aug 15, 2019

I don't think docker on windows can run Ubuntu containers

@DrahtBot
Copy link
Contributor

Needs rebase

@maflcko
Copy link
Member Author

maflcko commented Aug 15, 2019

Rebased without any changes due to overly sensitive merge conflict detection on GitHub. git range-diff should be empty: git range-diff bitcoin/master fa9404d76d faeacf3269

@maflcko maflcko merged commit faeacf3 into bitcoin:master Aug 15, 2019
@maflcko maflcko deleted the 1908-ciRework branch August 15, 2019 16:58
maflcko pushed a commit that referenced this pull request Aug 15, 2019
faeacf3 ci: Add note that this assumes a fresh git clone (MarcoFalke)
fa6cbdc ci: Use ./ci/ on non-travis host (MarcoFalke)
fa31bc3 ci: Remove dependence on travis, use it as fallback env (MarcoFalke)
fa0aac0 ci: Add retry (MarcoFalke)
fafe78f ci: Rename .travis/ to ./ci/ (MarcoFalke)

Pull request description:

  This moves the `.travis` folder to `ci` and removes dependence on travis, so that the test script can be run anywhere.

Top commit has no ACKs.

Tree-SHA512: 4d8c82f3eb4e9e047444b0e0f700485e929a3c4d27fc8777a95b8847f23ed507d2701cc92730198b14d1e753cbb558ffac883da558fc2ec72b8a12c4eaec9000
@sipsorcery
Copy link
Contributor

I don't think docker on windows can run Ubuntu containers

It can since https://docs.docker.com/docker-for-windows/wsl-tech-preview/

aaron@pcdodo:~$ uname -a
Linux pcdodo 4.19.57-microsoft-standard #1 SMP Wed Jul 3 20:47:25 UTC 2019 x86_64 x86_64 x86_64 GNU/Linux
aaron@pcdodo:~$ docker run ubuntu echo "I  love Windows"; lsb_release -a
I  love Windows
No LSB modules are available.
Distributor ID: Ubuntu
Description:    Ubuntu 18.04.2 LTS
Release:        18.04
Codename:       bionic

Actually it was already possible to use ubuntu docker containers on Windows but now it possible directly on top of the Windows Subsystem for Linux kernel.

@sipsorcery
Copy link
Contributor

Thanks ACK fa9404d - Maybe @sipsorcery or @NicolasDorier might also want to test here, then we'd have all OS's covered?

@fanquake I looked over the PR and successfully ran my appveyor build with the PR merged. Doesn't seem to be anything Windows related in this PR? Ony travis and shell scripts. Or did you testing the script changes with the WSL/Mingw builds on Windows?

@fanquake
Copy link
Member

Thanks @sipsorcery. I also thought it was possible to run on Windows.

Or did you testing the script changes with the WSL/Mingw builds on Windows?

Yea I just meant checking out this PR, and testing/running the scripts, to make sure they were working in your Windows development setups.

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Dec 16, 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.

9 participants