Skip to content

Commit

Permalink
Merge branch 'trunk'
Browse files Browse the repository at this point in the history
  • Loading branch information
ffrank913 committed Jun 14, 2024
1 parent 390c6f9 commit 9f06315
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/publish-to-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,12 @@ jobs:
uses: 'phips28/gh-action-bump-version@master'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_USER: 'DIVE[bot]'
GITHUB_EMAIL: '[email protected]'
with:
tag-prefix: 'v'
target-branch: 'trunk'
commit-message: 'CI: bumps version to {{version}}'
commit-message: 'DIVE[bot] deploy {{version}}'
skip-push: 'true'
- name: Push to protected branch trunk
uses: CasperWA/push-protected@v2
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shopware-ag/dive",
"version": "1.0.10",
"version": "1.0.14",
"description": "Shopware Spatial Framework",
"type": "module",
"main": "./build/dive.cjs",
Expand Down

0 comments on commit 9f06315

Please sign in to comment.