-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci(workflow): add GitHub Actions workflow for merging develop into ma…
…in on tag creation Introduce a new GitHub Actions workflow to automate the merging of the develop branch into the main branch whenever a new tag is pushed. This ensures that the main branch is always up-to-date with the latest changes from develop when a release is tagged. docs: add CODEOWNERS file and update README with usage instructions Create a CODEOWNERS file to specify that all code is currently owned by @mauvehed, ensuring clear ownership and responsibility for code changes. Update the README to include detailed usage instructions for both development and accessing the website, providing users and developers with clear guidance on how to interact with the project. Additionally, acknowledge inspiration from Zate's project, giving credit and context to the project's development. docs(DEVELOPERS.md): clarify branch creation instructions Add clarification to the branch creation instructions in the DEVELOPERS.md file, specifying that creating and switching to a develop branch is a one-time setup step. This helps developers understand the process more clearly and avoid unnecessary repetition.
- Loading branch information
Showing
4 changed files
with
71 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
name: Tag Release | ||
|
||
on: | ||
push: | ||
tags: | ||
- 'v*' | ||
|
||
jobs: | ||
merge-develop-to-main: | ||
name: Merge Develop into Main | ||
runs-on: ubuntu-latest | ||
|
||
steps: | ||
- name: Checkout Repository | ||
uses: actions/checkout@v3 | ||
with: | ||
# Fetch all history for accurate branch merging | ||
fetch-depth: 0 | ||
|
||
- name: Configure Git | ||
run: | | ||
git config user.name "github-actions[bot]" | ||
git config user.email "github-actions[bot]@users.noreply.github.com" | ||
- name: Check out Develop Branch | ||
run: git checkout develop | ||
|
||
- name: Merge Develop into Main | ||
run: | | ||
git checkout main | ||
git merge --no-ff develop -m "Merge branch 'develop' into 'main' on tag creation" | ||
- name: Push to Main Branch | ||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
run: | | ||
git push origin main |
Validating CODEOWNERS rules …
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
# All code currently owned by mauvehed | ||
|
||
* @mauvehed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters