Skip to content

Commit

Permalink
Merge pull request #16 from Kurocado-Studio/main
Browse files Browse the repository at this point in the history
switch base branch
  • Loading branch information
csantiago132 authored Oct 3, 2024
2 parents cf148fb + 8111074 commit 61596b9
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,17 @@ jobs:
- name: Run Prettier
run: pnpm prettier --check . # Use pnpm

- name: Delete existing semantic-release PR branches
run: |
git fetch --prune
BRANCHES=$(git branch -r | grep 'semantic-release-pr-' || true)
if [ -n "$BRANCHES" ]; then
echo "$BRANCHES" | sed 's/origin\///' | xargs -r git push origin --delete {}
else
echo "No semantic-release PR branches found."
fi
shell: bash

- name: Run Semantic Release
if: github.ref == 'refs/heads/main'
env:
Expand Down
11 changes: 4 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,12 @@
"dependencies": {
"@babel/core": "^7.24.0",
"@babel/eslint-parser": "^7.23.10",
"@commitlint/cli": "^19.0.3",
"@commitlint/config-conventional": "^19.0.3",
"@rushstack/eslint-patch": "^1.7.2",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@trivago/prettier-plugin-sort-imports": "^4.3.0",
"@typescript-eslint/eslint-plugin": "^7.1.1",
"@typescript-eslint/parser": "^7.1.1",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-import-resolver-typescript": "^3.6.1",
Expand All @@ -76,22 +73,22 @@
"eslint-plugin-tsdoc": "^0.2.17",
"eslint-plugin-unicorn": "^51.0.1",
"eslint-plugin-vitest": "^0.3.22",
"husky": "^9.0.11",
"lint-staged": "^15.2.10",
"prettier": "^3.3.3",
"prettier-plugin-packagejson": "^2.4.12",
"prettier-plugin-sort-imports": "^1.8.6",
"semantic-release": "^23.0.2",
"semantic-release-github-pullrequest": "^1.3.0",
"typescript": "^5.3.3",
"url-join": "^4.0.1"
},
"engines": {
"node": ">=18.18"
},
"peerDependencies": {
"@commitlint/cli": "^19.0.3",
"@commitlint/config-conventional": "^19.0.3",
"eslint": "^8.57.0",
"husky": "^9.0.11",
"prettier": "^3.3.3",
"semantic-release": "^23.0.2",
"typescript": "^5.3.3"
},
"publishConfig": {
Expand Down
3 changes: 2 additions & 1 deletion src/semantic-release/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ module.exports = {
'@semantic-release/changelog',
'@semantic-release/commit-analyzer',
'@semantic-release/release-notes-generator',
'@semantic-release/npm',
[
'semantic-release-github-pullrequest',
{
assets: ['CHANGELOG.md', 'package.json', 'package-lock.json'],
baseBranch: 'main',
branch: 'release',
// eslint-disable-next-line no-template-curly-in-string -- required by `semantic-release`.
message: 'chore(release): ${nextRelease.version} [skip ci]',
pullrequestBody:
Expand All @@ -27,5 +27,6 @@ module.exports = {
},
],
'@semantic-release/github',
'@semantic-release/npm',
],
};

0 comments on commit 61596b9

Please sign in to comment.