Skip to content

Commit 89387d0

Browse files
committed
ci: squash pr commits
1 parent a7a96e1 commit 89387d0

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/actions/setup/action.yml

+6
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ runs:
2424
echo "NODE_VERSION=${{ inputs.node-version }}" >> $GITHUB_ENV
2525
fi
2626
27+
- name: git config
28+
shell: bash
29+
run: |
30+
git config user.name "ngx-deploy-npm bot"
31+
git config user.email "-"
32+
2733
- name: Use Node.js
2834
uses: actions/setup-node@v4
2935
with:

.github/workflows/enforce-semantic-commits.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ jobs:
3434
PR_TITLE='${{ github.event.pull_request.title }}'
3535
echo "PR TITLE": '$PR_TITLE'
3636
echo "$PR_TITLE" | npx commitlint
37+
echo "::set-output name=pr_title::$PR_TITLE"
3738
3839
generate-changelog:
40+
needs: [check-pr-title]
3941
name: Generate Changelog #? should we comment in the PR?
4042
runs-on: ubuntu-latest
4143
steps:
@@ -44,7 +46,11 @@ jobs:
4446
fetch-depth: 0
4547
- uses: ./.github/actions/setup
4648

47-
- name: Generate Changelog
49+
- name: Generate tmp branch
50+
run: git checkout -b changelog
51+
52+
- name: Squash commits
4853
run: |
49-
git checkout -b changelog
50-
npx nx version ngx-deploy-npm --dry-run
54+
git reset --soft `git merge-base main HEAD`
55+
git commit -m "${{ steps.check-title.outputs.pr_title }}"
56+
git log

.github/workflows/publishment.yml

-6
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,6 @@ jobs:
5353
- uses: actions/checkout@v4
5454
- uses: ./.github/actions/setup
5555

56-
- name: git config
57-
shell: bash
58-
run: |
59-
git config user.name "Github Actions"
60-
git config user.email "-"
61-
6256
- uses: ./.github/actions/download-build
6357

6458
- name: Check npm credentials

0 commit comments

Comments
 (0)