Skip to content

Merge electron-builder pack and conda pack jobs#130

Merged
etpinard merged 5 commits intomasterfrom
fix-travis-tests
Sep 26, 2018
Merged

Merge electron-builder pack and conda pack jobs#130
etpinard merged 5 commits intomasterfrom
fix-travis-tests

Conversation

@etpinard
Copy link
Copy Markdown
Contributor

Currently, the conda pack recipe runs npm i and npm run pack before packing. This has the advantage of making the conda-pack process standalone, but when one runs the electron-build pack and the conda pack jobs in succession (like we do on CI), these two steps are duplicated 🐢 .

This PR makes the conda recipe/ folder assume that npm i and npm run pack have been ran before the conda-pack command. This should significantly speed our Travis and AppVeyor CI runs. 🐎

Moreover, for consistency, I merged the conda-pack steps with the electron-builder steps on CircleCI. Here, this makes our config file cleaner, but does add a few seconds of CI time. As the CircleCI workflow is almost always the first to complete, I think simplifying the config here is a win 🏆

Oh and this PR (for some reason) also makes Travis pass again. It has been falling all day long with

image

during the npm run pack command inside the conda recipe.


@jonmmease does this look ok to you?

- adapt ci commands accordingly
- this should speed up, ci jobs
  as we no longer have to run `npm i` and
  `npm run pack` twice on ci
- and for some reason this fixes(!) travis
@etpinard
Copy link
Copy Markdown
Contributor Author

Ping @jonmmease

I wouldn't want to modify your conda recipes w/o you taking a 👁️ at it.

@jonmmease
Copy link
Copy Markdown
Contributor

Sorry I missed this before! Will do by this evening

Copy link
Copy Markdown
Contributor

@jonmmease jonmmease left a comment

Choose a reason for hiding this comment

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

Looks great! Thanks for cleaning this up. Only single minor comment but otherwise 💃

Comment thread .circleci/config.yml Outdated
- run:
name: Conda pack
command: |
./miniconda.sh -b -p $HOME/miniconda
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

very minor, but this is the command that installs miniconda so it should probably be the last command in the "Install miniconda" block above.

I really like how much cleaner this is with the multi-line command: blocks!

@etpinard
Copy link
Copy Markdown
Contributor Author

Thanks for the review @jonmmease !

@etpinard etpinard merged commit 4bfe4e7 into master Sep 26, 2018
@etpinard etpinard deleted the fix-travis-tests branch September 26, 2018 14:07
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.

2 participants