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

CircleCI 2.0 compatibility #2257

Merged
merged 6 commits into from
Oct 30, 2018
Merged

CircleCI 2.0 compatibility #2257

merged 6 commits into from
Oct 30, 2018

Conversation

heavelock
Copy link
Contributor

@heavelock heavelock commented Oct 29, 2018

What does this PR do?

Changes the config of CircleCI to be compatible with CircleCI 2.0. The CircleCI 1.0 was EOLed on 31st of Agust, 2018.
https://circleci.com/blog/sunsetting-1-0/

Why was it initiated? Any relevant Issues?

Nope.

PR Checklist

  • Correct base branch selected? master for new features, maintenance_... for bug fixes
  • This PR is not directly related to an existing issue (which has no PR yet).
  • If the PR is making changes to documentation, docs pages can be built automatically.
    Just remove the space in the following string after the + sign: "+ DOCS"
  • If any network modules should be tested for the PR, add them as a comma separated list
    (e.g. clients.fdsn,clients.arclink) after the colon in the following magic string: "+TESTS:"
    (you can also add "ALL" to just simply run all tests across all modules)
  • All tests still pass.
  • Any new features or fixed regressions are be covered via new tests.
  • Any new or changed features have are fully documented.
  • Significant changes have been added to CHANGELOG.txt .
  • First time contributors have added your name to CONTRIBUTORS.txt .

@heavelock
Copy link
Contributor Author

Okay, ready for review.

@heavelock heavelock requested a review from megies October 29, 2018 15:13
Copy link
Member

@megies megies left a comment

Choose a reason for hiding this comment

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

Minor nitpick, but looks good to me and seems to work in CircleCI

name: install dependencies
command: |
conda create -n test-env
source activate test-env
Copy link
Member

Choose a reason for hiding this comment

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

conda activate ... is what they propose nowadays

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Oh, I was not even aware that they unified linux with windows in terms of that. Thanks!

@heavelock
Copy link
Contributor Author

Well, it seems that conda activate doesn't work on this docker image. The conda itself proposes adding lines to .bashrc but it will be easier to revert to source activate instead.

@megies
Copy link
Member

megies commented Oct 30, 2018

Well, it seems that conda activate doesn't work on this docker image. The conda itself proposes adding lines to .bashrc but it will be easier to revert to source activate instead.

Ah OK, yeah, then just use the old style, I guess. Whatever works..

@megies megies added the CI issue generally related to continuous integration label Oct 30, 2018
@megies megies added this to the 1.2.0 milestone Oct 30, 2018
@megies megies merged commit c426240 into obspy:master Oct 30, 2018
@krischer
Copy link
Member

Cool! Thanks for this :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI issue generally related to continuous integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants