Skip to content

Commit

Permalink
Fix(Build): use main branch
Browse files Browse the repository at this point in the history
  • Loading branch information
stonebuzz committed Dec 17, 2024
1 parent d865f6c commit ee9f2bb
Showing 1 changed file with 3 additions and 11 deletions.
14 changes: 3 additions & 11 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v4
with:
ref: develop
ref: main
fetch-depth: 0 #To Fetch All Tags and Branches

- name: Install Dependencies
Expand Down Expand Up @@ -61,22 +61,14 @@ jobs:
- name: "Update Full ChangeLog"
run: echo "${{ env.full_change_log }}" > CHANGELOG.md

- name: Update develop branch
- name: Update main branch
uses: EndBug/add-and-commit@v9
with:
default_author: github_actions
add: "['CHANGELOG.md', 'package.json']" #only this files will be added
push: origin HEAD:develop
push: origin HEAD:main
message: "ci(release): release new version ${{ env.tag_name }}"

- name: Merge develop -> master
uses: devmasx/merge-branch@master
with:
type: now
from_branch: develop
target_branch: master
github_token: ${{ secrets.GITHUB_TOKEN }}

##########################################
# Push / Pull translation files #
##########################################
Expand Down

0 comments on commit ee9f2bb

Please # to comment.