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

feat(publisher): Allow to configure channel for ERS #456

Merged
merged 1 commit into from Mar 24, 2018
Merged

feat(publisher): Allow to configure channel for ERS #456

merged 1 commit into from Mar 24, 2018

Conversation

gossi
Copy link

@gossi gossi commented Mar 21, 2018

pr for #455

@MarshallOfSound
Copy link
Member

@gossi Could you make this PR target the v6-api branch instead. 👍

@gossi gossi changed the base branch from master to v6-api March 21, 2018 16:07
@gossi
Copy link
Author

gossi commented Mar 21, 2018

@MarshallOfSound just changed to v6-api here in github (never used this before). Of course it marks my changes as conflicting. I don't often send PRs, so I don't know what's next. If there's anything I should do, please let me know.

PS I must admit, I only used github UI to do this PR 😉 😇

@malept
Copy link
Member

malept commented Mar 21, 2018

@gossi here are our guidelines for submitting pull requests: https://github.com/electron-userland/electron-forge/blob/master/CONTRIBUTING.md#filing-pull-requests

At the moment we're asking contributors who are submitting pull requests to point to the v6-api branch because we're in the middle of a large refactor, which will be released in v6. At this point you may have to use git locally to rebase your changes and force-push them back onto your GitHub branch.

@gossi
Copy link
Author

gossi commented Mar 21, 2018

ok I did. Anything else I can do?

@malept
Copy link
Member

malept commented Mar 21, 2018

@gossi

Hmmm. GitHub seems to think it's not mergeable. I think you need to do a rebase+squash.

When you squash, could you reword the commit so that it follows the correct format? This is so the change gets recorded in our changelog.

@MarshallOfSound kind of difficult to see whether the tests pass given that v6-api tests don't yet pass 😄

@gossi
Copy link
Author

gossi commented Mar 21, 2018

I rebased with v6-api. I think you can squash + merge? Which was probably blocked because of the missing rebase?

@malept
Copy link
Member

malept commented Mar 21, 2018

We usually "Rebase and merge", and this is the error we're seeing in GitHub:

image

@malept
Copy link
Member

malept commented Mar 21, 2018

Anyway, the advantage of you doing the squashing is so you can adjust the commit message as well, per my earlier comment.

@gossi
Copy link
Author

gossi commented Mar 21, 2018

ok. took me a while to figure out. But now should be one commit and the correct commit message (if I derived the scope correctly from other commit messages).

@malept malept changed the title Allow to configure channel for ers publish feat(publisher): Allow to configure channel for ERS Mar 21, 2018
@MarshallOfSound
Copy link
Member

LGTM

@MarshallOfSound MarshallOfSound merged commit d17d02c into electron:v6-api Mar 24, 2018
@gossi gossi deleted the patch-1 branch March 24, 2018 10:32
@malept
Copy link
Member

malept commented Apr 10, 2018

Hmmm. I just realized that this config option is not documented.

malept added a commit that referenced this pull request Apr 10, 2018
Backport of #456 to 5.x, with docs + minor code refactor.
MarshallOfSound pushed a commit that referenced this pull request Apr 11, 2018
Backport of #456 to 5.x, with docs + minor code refactor.
MarshallOfSound added a commit that referenced this pull request Apr 11, 2018
* temp

* Start working in new package structure

* Example maker

* All makers implemented and tests passing on darwin

* Add v6 branches to travis config

* Add v6 branches to appveyor config

* Gitignore _old

* Remove FIXME comments

* Remove from CI branch whitelist

* Install bolt on docker

* Add to whitelist

* Fix bolt usage on CI

* Run bolt build on CI

* Fix tests on CI

* Fix linting

* Fix CI

* Make publishers work and add specs

* Docs template

* Initial docs

* update plugin interface to support resolving strings

* more docs

* add deps and scripts

* send makeResults instead of flatten artifacts list

* feat(publisher): Allow to configure channel for ERS (#456)

* fix(publisher): call resolve() when electron-release-server publisher succeeds (#465)

ISSUES CLOSED: #460

* Fix publisher tests

* Remove stray console statement

* v6-api is a PR now, no need to explicitly add to CI

* Add top level license

* Change Maker/Publisher syntax so that they can be constructed with a config variable

* Fix custom init

* Allow absolute paths to custom modules
* Update to new @electron-forge/ scope

* Add missing semi

* Use absolute path for custom init to avoid runnig npm link on windows

* Fix appx test reference to fixture key file

* Remove shell completion support (#447)

tabtab is rather buggy and the alternative, commander-completion, needs
a custom completion script to be written and maintained.

* install new beta tagged bolt on CI

* Fix testing snap building in Travis

* fix remove error

* Fix config passing in tests

* fix search order
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

3 participants