diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index a204020..99e9b36 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -3,7 +3,7 @@ name: Create Release on: push: branches: - - "develop" + - "main" jobs: build: @@ -12,8 +12,6 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v3 - with: - ref: develop - name: Update CHANGELOG id: changelog @@ -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 }} diff --git a/scripts/release.sh b/scripts/release.sh index 39f5f2e..45876d3 100755 --- a/scripts/release.sh +++ b/scripts/release.sh @@ -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 \ No newline at end of file +git push origin main \ No newline at end of file