ci(release): ignore changelog from linter, don't rebase dev branch yet

kuzzleio · Dec 17, 2024 · 8f1d737 · 8f1d737
1 parent 0297387
commit 8f1d737
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/push-and-pr.workflow.yaml b/.github/workflows/push-and-pr.workflow.yaml
@@ -6,7 +6,6 @@ on:
       - master
       - beta
       - '[0-9]+-dev'
-      - eslint-9
   pull_request:
 
 jobs:
@@ -46,7 +45,7 @@ jobs:
 
   release:
     name: Release process
-    if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta' || github.ref == 'refs/heads/eslint-9') }}
+    if: ${{ github.event_name == 'push' && (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/beta') || github.ref == 'refs/heads/eslint-9' }}
     needs: [lint, functional-tests]
     runs-on: ubuntu-latest
     permissions:
@@ -73,9 +72,9 @@ jobs:
           SEMANTIC_RELEASE_SLACK_WEBHOOK: ${{ secrets.SEMANTIC_RELEASE_SLACK_WEBHOOK }}
         run: npx semantic-release
 
-      - name: Rebase dev branch (keep linear history)
-        if: ${{ github.ref != 'refs/heads/1-dev' }}
-        run: |
-          git fetch --no-tags origin 1-dev:1-dev
-          git rebase ${GITHUB_REF_NAME} 1-dev
-          git push origin 1-dev
+      # - name: Rebase dev branch (keep linear history)
+      #   if: ${{ github.ref != 'refs/heads/1-dev' }}
+      #   run: |
+      #     git fetch --no-tags origin 1-dev:1-dev
+      #     git rebase ${GITHUB_REF_NAME} 1-dev
+      #     git push origin 1-dev
diff --git a/.prettierignore b/.prettierignore
@@ -0,0 +1 @@
+CHANGELOG.md