Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

travis: Test with Git's master in _DL_UPSTREAM_GIT cron job #4746

Merged
merged 1 commit into from Jul 21, 2020

Conversation

kyleam
Copy link
Collaborator

@kyleam kyleam commented Jul 17, 2020

tools/ci/install-latest-git.sh installs the latest Git available in
the ppa:git-core/ppa repository (which tracks the latest release
closely), exiting early if that Git version happens to match the
bundled version. However, we recently switched to testing with a
git-annex from conda by default, so the latest cron job failed in the
setup phase because a bundled git wasn't present [0].

One option would be to update the script to not expect a bundled git
to exist. However, instead let's just update the cron job to use the
master branch from git.git. This allows us to catch issues sooner
than waiting for a release. The downside is that we may run into
issues that won't actually make it into a Git release. But (1) Git's
master branch is usually quite stable indicator of what makes will it
into a release because topic branches first have to graduate from next
and (2) I volunteer for the task of distinguishing "in release or in
master-only" failures.

Since we're doing a full rewrite of the script anyway, rename it to be
more consistent with the Travis option. Also, note that, although
this script is short and simple, it is similar enough to
tools/ci/install-minimum-git.sh in the master branch that it might be
worth merging the two.

[0] https://travis-ci.org/github/datalad/datalad/jobs/709288940


@yarikoptic
Copy link
Member

yarikoptic commented Jul 17, 2020

I wonder if testing against upcoming git would be a better fit for datalad-extensions, like we already do for git annex as well, so testing all datalad branches. We don't have ssh scenario tested there though yet

@kyleam kyleam force-pushed the upstream-git-setup branch 2 times, most recently from e40e4db to e239fa2 Compare Jul 20, 2020
tools/ci/install-latest-git.sh installs the latest Git available in
the ppa:git-core/ppa repository (which tracks the latest release
closely), exiting early if that Git version happens to match the
bundled version.  However, we recently switched to testing with a
git-annex from conda by default, so the latest cron job failed in the
setup phase because a bundled git wasn't present [0].

One option would be to update the script to not expect a bundled git
to exist.  However, instead let's just update the cron job to use the
master branch from git.git.  This allows us to catch issues sooner
than waiting for a release.  The downside is that we may run into
issues that won't actually make it into a Git release.  But (1) Git's
master branch is usually quite stable indicator of what makes will it
into a release because topic branches first have to graduate from next
and (2) I volunteer for the task of distinguishing "in release or in
master-only" failures.

Since we're doing a full rewrite of the script anyway, rename it to be
more consistent with the Travis option.  Also, note that, although
this script is short and simple, it is similar enough to
tools/ci/install-minimum-git.sh in the master branch that it might be
worth merging the two.

[0]: https://travis-ci.org/github/datalad/datalad/jobs/709288940
@kyleam kyleam force-pushed the upstream-git-setup branch 2 times, most recently from 9116ffb to 2b66ad7 Compare Jul 20, 2020
@kyleam kyleam marked this pull request as ready for review Jul 20, 2020
@kyleam
Copy link
Collaborator Author

kyleam commented Jul 20, 2020

I wonder if testing against upcoming git would be a better fit for datalad-extensions, like we already do for git annex as well, so testing all datalad branches.

If we are to keep a travis cron job for the latest git, testing against master rather than the latest release would be more useful for me.

@yarikoptic
Copy link
Member

yarikoptic commented Jul 20, 2020

If it is useful to you - great! I must confess that I stopped monitoring/reacting to cron jobs, and mostly react to emails about failed runs in datalad-extensions .

@yarikoptic
Copy link
Member

yarikoptic commented Jul 21, 2020

travis is actually "green" if you go to that build at https://travis-ci.org/github/datalad/datalad/builds/710026564

@yarikoptic
Copy link
Member

yarikoptic commented Jul 21, 2020

I guess it is Ok to merge, which I would do now.

@yarikoptic yarikoptic merged commit 0dd5a5c into datalad:maint Jul 21, 2020
1 of 2 checks passed
@kyleam kyleam deleted the upstream-git-setup branch Jul 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants