Skip to content

Commit 1a35583

Browse files
authored
fix: fixing the workflow (#34)
1 parent 39464b0 commit 1a35583

File tree

3 files changed

+34
-35
lines changed

3 files changed

+34
-35
lines changed

.github/workflows/hotfix.yml

Lines changed: 28 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ name: Hotfix Release
33
on:
44
push:
55
branches:
6-
- main
7-
tags:
8-
- '0.*'
6+
- 'hotfix/*'
97

108
env:
119
REGISTRY: docker.io
@@ -40,32 +38,32 @@ jobs:
4038
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4139
run: npx semantic-release
4240

43-
cherry-pick:
44-
if: contains(github.event.head_commit.message, 'hotfix:')
45-
runs-on: ubuntu-latest
46-
needs: semantic-release
47-
permissions:
48-
contents: write # to be able to push to the main branch
49-
pull-requests: write # to be able to create a pull request
50-
steps:
51-
- name: Checkout main branch
52-
uses: actions/checkout@v4
53-
with:
54-
ref: main
41+
# cherry-pick:
42+
# if: contains(github.event.head_commit.message, 'hotfix:')
43+
# runs-on: ubuntu-latest
44+
# needs: semantic-release
45+
# permissions:
46+
# contents: write # to be able to push to the main branch
47+
# pull-requests: write # to be able to create a pull request
48+
# steps:
49+
# - name: Checkout main branch
50+
# uses: actions/checkout@v4
51+
# with:
52+
# ref: main
5553

56-
- name: Configure Git
57-
run: |
58-
git config user.name "github-actions"
59-
git config user.email "github-actions@github.com"
54+
# - name: Configure Git
55+
# run: |
56+
# git config user.name "github-actions"
57+
# git config user.email "github-actions@github.com"
6058

61-
- name: Cherry-pick hotfix commit into dev
62-
run: |
63-
# Get the latest hotfix commit from main
64-
HOTFIX_COMMIT=$(git log -1 --pretty=format:"%H")
65-
# Fetch the dev branch so it is available locally
66-
git fetch origin dev:dev
67-
# Check out dev
68-
git checkout dev
69-
# Cherry-pick the commit from main to dev
70-
git cherry-pick $HOTFIX_COMMIT
71-
git push origin dev
59+
# - name: Cherry-pick hotfix commit into dev
60+
# run: |
61+
# # Get the latest hotfix commit from main
62+
# HOTFIX_COMMIT=$(git log -1 --pretty=format:"%H")
63+
# # Fetch the dev branch so it is available locally
64+
# git fetch origin dev:dev
65+
# # Check out dev
66+
# git checkout dev
67+
# # Cherry-pick the commit from main to dev
68+
# git cherry-pick $HOTFIX_COMMIT
69+
# git push origin dev

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
branches:
66
- main
77
tags:
8-
- '0.*'
8+
- 'v0.*'
99

1010
env:
1111
REGISTRY: docker.io

release.config.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
module.exports = {
22
preset: 'angular',
33
branches: [
4-
{ name: 'main' },
5-
{ name: 'dev', channel: 'dev', prerelease: false }
4+
'main',
5+
'dev',
6+
{ name: 'hotfix/*', prerelease: false }
67
],
7-
initialVersion: '0.1.0',
8-
tagFormat: '${version}',
8+
initialVersion: 'v0.0.0',
9+
tagFormat: 'v${version}',
910
releaseRules: [
1011
{ type: 'major', release: 'patch' },
1112
{ type: 'feat', release: 'minor' },

0 commit comments

Comments
 (0)