Browse Source

fix(admin-ui): Fix publish flow to ensure correct version in UI

Michael Bromley 6 years ago
parent
commit
dc528141d7
2 changed files with 5 additions and 5 deletions
  1. 3 3
      README.md
  2. 2 2
      package.json

+ 3 - 3
README.md

@@ -115,11 +115,11 @@ To make a release:
 
 ##### 1. `yarn publish-release`
 
-This will first build all packages to ensure the distributed files are up to date.
+It will run `lerna publish` which will prompt for which version to update to. Although we are using [conventional commits](https://www.conventionalcommits.org), the version is not automatically being calculated from the commit messages. Therefore the next version should be manually selected. 
 
-Next it will run `lerna publish` which will prompt for which version to update to. Although we are using [conventional commits](https://www.conventionalcommits.org), the version is not automatically being calculated from the commit messages. Therefore the next version should be manually selected. 
+Next it will build all packages to ensure the distributed files are up to date.
 
-This command will also create changelog entries for this release.
+Finally the command will create changelog entries for this release.
 
 ##### 2. `git push origin master --follow-tags`
 

+ 2 - 2
package.json

@@ -18,7 +18,7 @@
     "postcommit": "git update-index --again",
     "commitmsg": "commitlint -e $GIT_PARAMS",
     "prepush": "yarn test:all && cd admin-ui && yarn build --prod",
-    "version": "yarn generate-changelog && git add CHANGELOG.md",
+    "version": "yarn build && yarn generate-changelog && git add CHANGELOG.md",
     "dev-server:start": "cd packages/dev-server && yarn start",
     "dev-server:populate": "cd packages/dev-server && yarn populate",
     "test:all": "cd admin-ui && yarn test --watch=false --browsers=ChromeHeadlessCI --progress=false && cd ../ && yarn test:common && yarn test:core && yarn test:email-plugin && yarn test:e2e",
@@ -29,7 +29,7 @@
     "test:admin-ui": "cd admin-ui && yarn test --watch=false --browsers=ChromeHeadlessCI --progress=false",
     "build": "lerna run build",
     "generate-changelog": "ts-node scripts/changelogs/generate-changelog.ts",
-    "publish-release": "yarn build && lerna publish -m \"chore: Publish %s\" --no-push"
+    "publish-release": "lerna publish -m \"chore: Publish %s\" --no-push"
   },
   "devDependencies": {
     "@commitlint/cli": "^7.6.1",