Skip to content

Commit

Permalink
chore: update github worflows
Browse files Browse the repository at this point in the history
  • Loading branch information
Stéphane committed Jul 13, 2023
1 parent d80db5f commit 2d9f0fd
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 12 deletions.
12 changes: 1 addition & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: Create Release
on:
push:
branches:
- "develop"
- "main"

jobs:
build:
Expand All @@ -12,8 +12,6 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v3
with:
ref: develop

- name: Update CHANGELOG
id: changelog
Expand All @@ -38,11 +36,3 @@ jobs:
branch: develop
commit_message: "docs: update CHANGELOG.md for ${{ github.ref_name }} [skip ci]"
file_pattern: CHANGELOG.md

- name: Merge develop in main
uses: devmasx/merge-branch@master
with:
type: now
from_branch: develop
target_branch: main
github_token: ${{ secrets.GITHUB_TOKEN }}
10 changes: 9 additions & 1 deletion scripts/release.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
#!/bin/sh
set -e

# Checkout main and merge develop
git checkout main
git merge develop

# Back to develop
git checkout -

# Push to GitHub
git push origin --tags
git push origin develop
git push origin --tags
git push origin main

0 comments on commit 2d9f0fd

Please sign in to comment.