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

Add CircleCI config #6

Merged
merged 9 commits into from
Jan 10, 2018
Merged

Add CircleCI config #6

merged 9 commits into from
Jan 10, 2018

Conversation

lukechilds
Copy link
Member

Integrate with CircleCI, currently only for linting but potentially for building app releases in the future.

@lukechilds lukechilds force-pushed the circleci branch 2 times, most recently from 1ed9696 to ec73e6b Compare January 9, 2018 09:53
@sindresorhus
Copy link
Contributor

sindresorhus commented Jan 9, 2018

If we want to do automated builds, we have to use version 1 of the config, as version 2 doesn't support macOS yet.

@lukechilds
Copy link
Member Author

Ah, ok. Are you able to take over on this if you've done it before then?

I just wanted to play with CircleCI 😂

Really need to crack on with CLI testing.

@sindresorhus
Copy link
Contributor

Will do

@sindresorhus
Copy link
Contributor

Ok, so turns CircleCI added support for macOS in v2 since the last time I tried it, but macOS support is not included the free plan. What do you want to do? If this project is planned to be open source, we can just do automated Linux and Windows builds for now, and do macOS builds when it's open source.

@lukechilds
Copy link
Member Author

Yeah, that makes sense.

I love Travis (and now Circle) and would love to support them, but tbh for a project of this size and scale the pricing seems pretty unreasonable.

@lukechilds
Copy link
Member Author

lukechilds commented Jan 10, 2018

BTW, just out of interest, is it possible to automatically build files from CI and have CI upload them to a GitHub release pages?

So we just do a new GitHub release and CI handles the rest?

Not particularly important but would be cool af. Especially nice considering we might not be maintaining this project long term.

@sindresorhus
Copy link
Contributor

BTW, just out of interest, is it possible to automatically build files from CI and have CI upload them to a GitHub release pages? So we just do a new GitHub release and CI handles the rest?

Yes, that's exactly what's already implemented in master for Travis, and in this PR for CircleCI. electron-builder takes care of building and uploading to a new GitHub release.

@lukechilds
Copy link
Member Author

Awesome, any preference over Travis or Circle?

@sindresorhus
Copy link
Contributor

You wanted CircleCI because it's free for private, right?

@sindresorhus
Copy link
Contributor

sindresorhus commented Jan 10, 2018

It requires some more work to build for Windows and Linux on Linux. I'll look into it later. Need to adapt https://github.com/develar/onshape-desktop-shell/blob/675ec6d9b149866bfdafad30e3d251047e31b31c/.travis.yml#L34-L40 to CircleCI's Docker running thing.

@lukechilds
Copy link
Member Author

lukechilds commented Jan 10, 2018

You wanted CircleCI because it's free for private, right?

Yeah, but if it's a pain to setup automated build don't worry about it, just making sure yarn dist doesn't fail should be enough for now. We can just build manually for sending builds to Pondsea to test, I think he might even be comfortable using git and building himself.

Automated builds -> GH Release is only important once we're public so if that's simpler on Travis we can just switch to Travis at that point when we're public.

@sindresorhus
Copy link
Contributor

Automated builds -> GH Release is only important once we're public so if that's simpler on Travis we can just switch to Travis at that point when we're public.

Yeah, ok, let's do that. It's simple enough to build locally for testing.

@sindresorhus
Copy link
Contributor

Yeah, but if it's a pain to setup automated build don't worry about it, just making sure yarn dist doesn't fail should be enough for now.

Can't easily do that with CircleCI, as that runs on Linux, which requires the Docker thing, which is more work. But we can at least run linting on CircleCI for now, if that's ok?

@lukechilds
Copy link
Member Author

It was working with my previous commit: 97c97ad

or does pack not do what I think it does?

@sindresorhus
Copy link
Contributor

sindresorhus commented Jan 10, 2018

It was working with my previous commit: 97c97ad

According to the electron-builder docs it needs some apt packages installed, but I guess they already are on CircleCI.

or does pack not do what I think it does?

pack builds for the current platform and only the app, while dist builds for all platforms including the distribution formats like installers. Happy to improve the naming if you have any suggestions.

@sindresorhus sindresorhus merged commit f005455 into master Jan 10, 2018
@sindresorhus sindresorhus deleted the circleci branch January 10, 2018 07:48
@lukechilds
Copy link
Member Author

pack builds for the current platform and only the app, while dist builds for all platforms including the distribution formats like installers. Happy to improve the naming if you have any suggestions.

Personally I would say build is more clear. build and dist seem like a more clear distinctions purely because build is common for web projects which I'm more used to. pack and dist are easier to confuse IMO but if that's common terminology in Electron then happy to keep it, I'm sure it won't take long to get used to.

@sindresorhus
Copy link
Contributor

build makes it seem like you're building everything to me. pack really just means, pack the JS in the Electron binary. How electron-builder works, is that it takes the Electron app bundle, which is just really an Electron demo app, and just adds in your resources and changes the metadata files. So it's really just packing our files into the Electron app bundle, but I can see how that doesn't make sense if you don't know how Electron apps are built.

@lukechilds
Copy link
Member Author

Cool, lets stick with pack then 👍

jorian added a commit that referenced this pull request Feb 26, 2020
* [started #615] use-the-concept-of-orders-instead-of-swaps

* debug

* - Add new format-order-data file
- Add some unit test

* db: rename swaps2 to orders2

* api: Add myOrders method

* api: Add cancelAllOrders method

* orders data: update type of order

* db: Add removeOrder method in DB

* add formatOrder and formatSwap data

* test case: taker order is filled in 30s

* test case: maker order can has mutil swaps

* test case: maker order is filled

* swaplist: fix order css

* swap-db.js: remove getSwapCount func and add getOrdersCount

* Order: cancel all pair orders before create a new one

* Dashboard: update  ActivityList

* fix bug: swap not found

* ui: update swap Detail modal

* ui: update SwapList

* remove unused file

* fix #5: steps of swap show wrong amount

* fix #6: add cancel button for open order

* fix #4: trade history shows ongoing trade as completed

* fix #15: replace CHIPS with BTC as always-enabled-coin

* fix #3 sort orders based on price

* fix #9 trade history shows cancelled orders as completed

* fix #18: replace todo text when restoring seed phrase

* fix #13 update HUSH

* fix #13 rename InstantDEX to DEX

* fix #13 add BET

* fix #13 disable BET

* fix #12 disabling a coin should be possible again

* fix #17 ERC20 swaps give wrong error when ETH funds lack

* remove annoying log

* add base variable

* fix #19 order not cancellable, not in mm2.0 response but still visible

* fix #27 withdraw confirmation screen shows wrong information

* fix #28 withdraw full balance not working

* fix #22 clicking Price in orderbook section populates a too high buy Price

* add BET

* add HODL, disable HODLC

* add HUSH

* add preliminary MGW support

* let nonofficial mm2 coins still be enabled through electrum

* enable MGW, add COMMOD

* add LABS

* add BUSD, GIN, USDC

* re-enable OOT

* update VRSC daemons

* remove dead GIN electrum

* remove dead coins (#34)

Co-authored-by: Jorian <jorian@outlook.com>
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