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

Fix npm prerelease #732

Merged
merged 4 commits into from
Aug 22, 2020
Merged

Conversation

fcollonval
Copy link
Member

Fixes #730

Set tag for npm publication according to the pre-release status of the GitHub release.

@fcollonval fcollonval added this to the 0.21.0 milestone Aug 22, 2020
@fcollonval fcollonval merged commit d52688c into jupyterlab:master Aug 22, 2020
@fcollonval fcollonval deleted the fix/npm-prerelease branch August 22, 2020 14:53
@fcollonval
Copy link
Member Author

@meeseeksdev backport to 0.11.x

@lumberbot-app
Copy link

lumberbot-app bot commented Aug 22, 2020

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
$ git checkout 0.11.x
$ git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
$ git cherry-pick -m1 d52688c8935108dc9520a9ddd8c4a3eaa5c0a168
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
$ git commit -am 'Backport PR #732: Fix npm prerelease'
  1. Push to a named branch :
git push YOURFORK 0.11.x:auto-backport-of-pr-732-on-0.11.x
  1. Create a PR against branch 0.11.x, I would have named this PR:

"Backport PR #732 on branch 0.11.x"

And apply the correct labels and milestones.

Congratulation you did some good work ! Hopefully your backport PR will be tested by the continuous integration and merged soon!

If these instruction are inaccurate, feel free to suggest an improvement.

fcollonval added a commit to fcollonval/jupyterlab-git that referenced this pull request Aug 22, 2020
* Set npm tag depending on the release status

* Bump to alpha 1
fcollonval added a commit that referenced this pull request Aug 22, 2020
@fcollonval fcollonval mentioned this pull request Aug 23, 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.

Alpha is listed as the latest version in NPM
1 participant