feat(dev): via a new Prisma Dev extension #109

divyenduz · 2020-04-22T16:42:02Z

Merging this should release a new "Prisma Dev" extension with name: prisma-dev, displayName: Prisma Dev

- Fixes #47 - Fixes #93 This PR is made against "alpha" and merging this should release a "new" alpha extension.

- Remove the alpha branch dependency - Push only when bumping alpha - Bump @prisma/* packages when updating package.json

divyenduz · 2020-04-22T17:03:27Z

Pending:

Not committing at all from the latest job won't work as we use scripts/prisma-version file to know if we have published the extension for a Prisma version. Just having prisma-version for alpha will make the latest release job publish on loop. I will need to adjust this PR, probably by creating 2 files, scripts/prisma-version (at least this gets committed from latest) and scripts/prisma-version-alpha This can be replaced by using vsce show <publisher>.<extension-name> e.g. vsce show Prisma.prisma-alpha removing the need of this file, removing the stateful information from extension repo's version control.
The alpha channel code changes the extension name/displayName to use the alpha variants but the latest workflow must also change them back. This is needed since we don't plan to commit from the latest workflow anymore.

scripts/bump-sha.sh

Co-Authored-By: Jan Piotrowski <[email protected]>

divyenduz · 2020-04-23T08:20:30Z

Next steps:

Since Add language server functionality, implement "Jump to definition" #106 is merged, we need to add new @prisma/* package dependencies to bump-sha.sh (probably rename this file)
Add release-workflow.md to the PR documenting the automated release workflow.

divyenduz · 2020-04-23T09:53:24Z

Merging this PR should release

Extension Prisma with version 2.0.0-beta.3 (since it is being changed from 0.0.32).
Extension Prisma Dev with version 2.0.0-alpha.1127 (latest alpha as of this comment) and commit the version etc to vscode repo master.

Next steps (probably in a separate PR):

Release tags Add tag/release on publishing #73 - some spec needed re dev, latest channels
Extension only release (TODO: Create GH issue)
Adjust prisma-version.sh once we release dev channel for Prisma (TODO: Create GH issue)

- rename to dev - merge with master, adjust bump deps - add release-workflow.md

release-workflow.md

scripts/publish.sh

matthewmueller

LGTM!

release-workflow.md

janpio · 2020-04-23T18:48:51Z

release-workflow.md

+1. If they are different, `bump.sh <channel> <version>` is called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish)
+1. `bump.sh` updates the `package.json` files in root, client, server and sets `name`, `displayName`, `version`, `dependencies.@prisma/*` packages, and `prisma.version` values.
+1. `check-update.sh` then commits these changes, this commit is required because `vsce publish` (to be run later requires a clean git state)
+1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command published the "Prisma" extension.


Suggested change

1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command published the "Prisma" extension.

1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command publishes the "Prisma" extension.

janpio · 2020-04-23T18:50:10Z

release-workflow.md

+### Dev workflow
+
+1. `yarn vsce:check dev` calls `check-update.sh dev`
+1. `check-update.sh` sets up the repo with Prismo bot as the user, all commits in the remainder of this workflow are attributed to Prismo.
+1. `check-update.sh` compares `CURRENT_VERSION` (extension) against `NPM_VERSION` of Prisma CLI.
+1. If they are same, this script exits
+1. If they are different, `bump.sh <channel> <version>` is called with `channel=dev` and `version=NPM_VERSION` (i.e. the new version of extension to publish)
+1. `bump.sh` updates the `package.json` files in root, client, server and sets `name`, `displayName`, `version`, `dependencies.@prisma/*` packages, and `prisma.version` values.
+1. `check-update.sh` then commits these changes, this commit is required because `vsce publish` (to be run later requires a clean git state)
+1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=dev` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command published the "Prisma Dev" extension.
+1. `publish.sh` pushes to vscode master repo. Only changes from the dev channel are pushed.
+
+### Latest workflow
+
+1. `yarn vsce:check latest` calls `check-update.sh latest`
+1. `check-update.sh` sets up the repo with Prismo bot as the user, all commits in the remainder of this workflow are attributed to Prismo.
+1. `check-update.sh` compares `CURRENT_VERSION` (extension) against `NPM_VERSION` of Prisma CLI.
+1. If they are same, this script exits
+1. If they are different, `bump.sh <channel> <version>` is called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish)
+1. `bump.sh` updates the `package.json` files in root, client, server and sets `name`, `displayName`, `version`, `dependencies.@prisma/*` packages, and `prisma.version` values.
+1. `check-update.sh` then commits these changes, this commit is required because `vsce publish` (to be run later requires a clean git state)


With the minimal difference we have here, these two lists can just be combined instead of duplicating everything, and the minimal differences are highlighted and made explicit.

Isn't it easier to read a specific workflow than both together?

janpio · 2020-04-23T18:50:33Z

release-workflow.md

+1. If they are different, `bump.sh <channel> <version>` is called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish)
+1. `bump.sh` updates the `package.json` files in root, client, server and sets `name`, `displayName`, `version`, `dependencies.@prisma/*` packages, and `prisma.version` values.
+1. `check-update.sh` then commits these changes, this commit is required because `vsce publish` (to be run later requires a clean git state)
+1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command published the "Prisma" extension.


The names are hardcoded in here, based on the value of channel?

Yes, we are in a specific workflow.

Co-Authored-By: Jan Piotrowski <[email protected]>

Fixes #82

Divyendu Singh added 3 commits April 21, 2020 13:51

feat(alpha): via a new extension

80c2a38

- Fixes #47 - Fixes #93 This PR is made against "alpha" and merging this should release a "new" alpha extension.

Merge branch 'master' into feat_alpha

df4af38

feat(alpha): incorporate release feedback

a36dca4

- Remove the alpha branch dependency - Push only when bumping alpha - Bump @prisma/* packages when updating package.json

divyenduz requested review from matthewmueller and janpio April 22, 2020 16:42

divyenduz added this to the Beta 4 milestone Apr 22, 2020

feat(alpha): use vsce show for extension version

c4a7e6e

janpio reviewed Apr 22, 2020

View reviewed changes

scripts/bump-sha.sh Outdated Show resolved Hide resolved

Update scripts/bump-sha.sh

c1fa319

Co-Authored-By: Jan Piotrowski <[email protected]>

divyenduz requested a review from carmenberndt April 23, 2020 08:11

Divyendu Singh added 2 commits April 23, 2020 13:42

Merge branch 'master' into feat_alpha

3740f33

Merge branch 'feat_alpha' of github.com:prisma/vscode into feat_alpha

c11eb70

divyenduz force-pushed the feat_alpha branch from 7efce66 to eeeff23 Compare April 23, 2020 09:49

divyenduz changed the title ~~feat(alpha): via a new alpha extension~~ feat(dev): via a new alpha extension Apr 23, 2020

divyenduz changed the title ~~feat(dev): via a new alpha extension~~ feat(dev): via a new Prisma Dev extension Apr 23, 2020

feat(dev): publish Prisma Dev as a new extension

5412c64

- rename to dev - merge with master, adjust bump deps - add release-workflow.md

divyenduz force-pushed the feat_alpha branch from eeeff23 to 5412c64 Compare April 23, 2020 10:10

carmenberndt marked this pull request as ready for review April 23, 2020 10:14

carmenberndt reviewed Apr 23, 2020

View reviewed changes

release-workflow.md Show resolved Hide resolved

carmenberndt reviewed Apr 23, 2020

View reviewed changes

scripts/publish.sh Show resolved Hide resolved

matthewmueller approved these changes Apr 23, 2020

View reviewed changes

janpio reviewed Apr 23, 2020

View reviewed changes

release-workflow.md Outdated Show resolved Hide resolved

janpio reviewed Apr 23, 2020

View reviewed changes

janpio approved these changes Apr 23, 2020

View reviewed changes

Update release-workflow.md

cab7868

Co-Authored-By: Jan Piotrowski <[email protected]>

carmenberndt approved these changes Apr 24, 2020

View reviewed changes

Divyendu Singh added 2 commits April 24, 2020 13:35

fix: job name

ffcb342

Fixes #82

Merge branch 'feat_alpha' of github.com:prisma/vscode into feat_alpha

8f0a34a

divyenduz mentioned this pull request Apr 24, 2020

Rename "Automatic Publish" #82

Closed

divyenduz merged commit 76c9b3d into master Apr 24, 2020

divyenduz deleted the feat_alpha branch April 24, 2020 08:07

divyenduz mentioned this pull request Apr 24, 2020

Use "patch" for extension versioning #114

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(dev): via a new Prisma Dev extension #109

feat(dev): via a new Prisma Dev extension #109

divyenduz commented Apr 22, 2020 •

edited

Loading

divyenduz commented Apr 22, 2020 •

edited

Loading

divyenduz commented Apr 23, 2020 •

edited

Loading

divyenduz commented Apr 23, 2020 •

edited

Loading

matthewmueller left a comment

janpio Apr 23, 2020

janpio Apr 23, 2020

divyenduz Apr 24, 2020

janpio Apr 23, 2020

divyenduz Apr 24, 2020

	1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command published the "Prisma" extension.
	1. `yarn vsce:publish <channel> <version>` i.e. `publish.sh <channel> <version>` is then called with `channel=latest` and `version=NPM_VERSION` (i.e. the new version of extension to publish). This command publishes the "Prisma" extension.

feat(dev): via a new Prisma Dev extension #109

feat(dev): via a new Prisma Dev extension #109

Conversation

divyenduz commented Apr 22, 2020 • edited Loading

divyenduz commented Apr 22, 2020 • edited Loading

divyenduz commented Apr 23, 2020 • edited Loading

divyenduz commented Apr 23, 2020 • edited Loading

matthewmueller left a comment

Choose a reason for hiding this comment

janpio Apr 23, 2020

Choose a reason for hiding this comment

janpio Apr 23, 2020

Choose a reason for hiding this comment

divyenduz Apr 24, 2020

Choose a reason for hiding this comment

janpio Apr 23, 2020

Choose a reason for hiding this comment

divyenduz Apr 24, 2020

Choose a reason for hiding this comment

divyenduz commented Apr 22, 2020 •

edited

Loading

divyenduz commented Apr 22, 2020 •

edited

Loading

divyenduz commented Apr 23, 2020 •

edited

Loading

divyenduz commented Apr 23, 2020 •

edited

Loading