chore(integration): fix next version publication

iTowns · Feb 8, 2023 · fdb4813 · fdb4813
1 parent 7f86d26
commit fdb4813
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -85,6 +85,9 @@ jobs:
     steps:
 
       - uses: actions/checkout@v2
+        with:
+          # fetch all branches
+          fetch-depth: 0
 
       # Configure git user for later command induced commits
       - uses: fregante/setup-git-user@v1
@@ -103,8 +106,21 @@ jobs:
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
+      - name: publish itowns@next npm package (following a release)
+        if: ${{ startsWith(github.event.head_commit.message, 'release v' ) }}
+        run: |
+          git checkout next
+          git reset --hard master
+          npm run publish-next
+          git push -f
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+
       - name: publish itowns@next npm package
+        if: ${{ !startsWith(github.event.head_commit.message, 'release v' ) }}
         run: |
+          git checkout next
+          git merge master
           npm run publish-next
           git push
         env:

diff --git a/config/conventionalChangelog/config.js b/config/conventionalChangelog/config.js
@@ -49,10 +49,6 @@ var writerOpts = {
             discard = false;
         });
 
-        if (commit.header && commit.header.includes('-next.')) {
-            return;
-        }
-
         if (['feat', 'features', 'feature'].includes(commit.type)) {
             commit.type = 'Features';
         } else if (commit.type === 'fix') {