Merge pull request #116 from Sphereon-Opensource/fix/CI

Fix/ci
Sphereon-Opensource · Jul 14, 2023 · 01f97f1 · 01f97f1
2 parents fc03507 + 69a3200
commit 01f97f1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/build-test-on-pr.yml b/.github/workflows/build-test-on-pr.yml
@@ -27,10 +27,8 @@ jobs:
         with:
           node-version: '18.x'
           cache: 'pnpm'
-      - run: pnpm add -g pnpm
-
-      - run: yarn install --frozen-lockfile
-      - run: pnpm install
+      - run: git diff -u
+      - run: pnpm install --frozen-lockfile
       - run: pnpm build
       - name: run CI tests
         env:

diff --git a/.github/workflows/build-test-publish-on-push.yml b/.github/workflows/build-test-publish-on-push.yml
@@ -7,6 +7,8 @@ on:
       - 'develop'
       - 'feature/**'
       - 'feat/**'
+      - 'fix/**'
+      - 'fixes/**'
 
 jobs:
   build-test-publish:
@@ -39,7 +41,6 @@ jobs:
         with:
           node-version: '18.x'
           cache: 'pnpm'
-      - run: pnpm add -g pnpm
       - run: pnpm install
       - run: pnpm build
       - name: run CI tests
@@ -73,12 +74,16 @@ jobs:
 
       - name: publish @latest when on main
         if: github.ref == 'refs/heads/main'
-        run: yarn publish:latest
+        run: pnpm publish:latest
 
       - name: publish @next when on develop
         if: github.ref == 'refs/heads/develop'
-        run: yarn publish:next
+        run: pnpm publish:next
+
+      - name: publish @next when on fix branch
+        if: startsWith(github.ref, 'refs/heads/fix')
+        run: pnpm publish:next
 
       - name: publish @unstable when on unstable branch
         if: startsWith(github.ref, 'refs/heads/feat')
-        run: yarn publish:unstable
+        run: pnpm publish:unstable