chore: prepare publish

gchoqueux · May 30, 2024 · 07eabb0 · 07eabb0
1 parent e01c128
commit 07eabb0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -56,7 +56,7 @@ jobs:
 
       # Build documentation
       - name: Build documentation
-        # if: ${{ success() && github.ref == 'refs/heads/master' }}
+        if: ${{ success() && github.ref == 'refs/heads/master' }}
         run: npm run doc -- -d buildDocs
 
       # Prepare archive for deploying
@@ -172,7 +172,7 @@ jobs:
   # Publish NPM package
   publish:
     name: Publish NPM package
-    # if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ github.ref == 'refs/heads/master' }}
     # needs: [finish-coverage, functional-tests]
     needs: [finish-coverage]
     runs-on: ubuntu-latest
@@ -220,7 +220,7 @@ jobs:
         if: ${{ !startsWith(github.event.head_commit.message, 'release v' ) }}
         run: |
           git checkout next
-          git merge master
+          git merge origin/master
           npm run publish-next
           git push
         env:
@@ -230,7 +230,7 @@ jobs:
   # Deploy on itowns.github.io website
   deploy:
     name: Deploy to itowns.github.io
-    # if: ${{ github.ref == 'refs/heads/master' }}
+    if: ${{ github.ref == 'refs/heads/master' }}
     # needs: [finish-coverage, functional-tests, check-commit-message]
     needs: [finish-coverage, check-commit-message]
     runs-on: ubuntu-latest
@@ -295,9 +295,8 @@ jobs:
   # Create GitHub release
   release:
     name: Release GitHub
-    # if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }}
+    if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }}
     # needs: [finish-coverage, functional-tests, check-commit-message]
-    if: ${{ startsWith( github.event.head_commit.message, 'release v' ) }}
     needs: [finish-coverage, check-commit-message]
     runs-on: ubuntu-latest
     steps:

diff --git a/package.json b/package.json
@@ -32,7 +32,7 @@
     "start-https": "cross-env NODE_ENV=development webpack serve --https",
     "debug": "cross-env noInline=true npm start",
     "prepublishOnly": "npm run build && npm run transpile",
-    "prepare": "cross-env NO_UPDATE_NOTIFIER=true node ./config/prepare.mjs",
+    "prepare": "cross-env NO_UPDATE_NOTIFIER=true node ./config/prepare.mjs && npm run prepare --ws --if-present",
     "watch": "node ./config/concurrently.mjs watch",
     "changelog": "conventional-changelog -n ./config/conventionalChangelog/config.cjs -i changelog.md -s",
     "bump": "if [ -z $npm_config_level ]; then grunt bump:minor;  else grunt bump:$npm_config_level; fi && npm run changelog && npm run update-packages && npm install && git add -A && git commit --amend --no-edit",

diff --git a/packages/Debug/package.json b/packages/Debug/package.json
@@ -21,7 +21,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/iTowns/itowns.git"
+    "url": "git+https://github.com/gchoqueux/itowns.git"
   },
   "license": "(CECILL-B OR MIT)",
   "bugs": {

diff --git a/packages/Geodesy/package.json b/packages/Geodesy/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itowns_gc/geodesy",
-  "version": "2.43.2-next.0",
+  "version": "2.43.1",
   "description": "Geodesy",
   "type": "module",
   "main": "lib/Main.js",
@@ -28,7 +28,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/iTowns/itowns.git"
+    "url": "git+https://github.com/gchoqueux/itowns.git"
   },
   "license": "(CECILL-B OR MIT)",
   "bugs": {

diff --git a/packages/Gui/package.json b/packages/Gui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@itowns_gc/gui",
-  "version": "2.43.2-next.0",
+  "version": "2.43.1",
   "description": "Gui",
   "type": "module",
   "main": "lib/Main.js",
@@ -23,7 +23,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/iTowns/itowns.git"
+    "url": "git+https://github.com/gchoqueux/itowns.git"
   },
   "license": "(CECILL-B OR MIT)",
   "bugs": {

diff --git a/packages/Main/package.json b/packages/Main/package.json
@@ -1,6 +1,6 @@
 {
   "name": "itowns_gc",
-  "version": "2.43.2-next.0",
+  "version": "2.43.1",
   "description": "A JS/WebGL framework for 3D geospatial data visualization",
   "type": "module",
   "main": "lib/Main.js",
@@ -42,14 +42,14 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/iTowns/itowns.git"
+    "url": "git+https://github.com/gchoqueux/itowns.git"
   },
   "license": "(CECILL-B OR MIT)",
   "bugs": {
     "url": "https://github.com/iTowns/itowns/issues"
   },
   "dependencies": {
-    "@itowns_gc/geodesy": "^2.43.2-next.0",
+    "@itowns_gc/geodesy": "^2.43.1",
     "@mapbox/mapbox-gl-style-spec": "^13.28.0",
     "@mapbox/vector-tile": "^1.3.1",
     "@tmcw/togeojson": "^5.8.1",