Skip to content

Commit

Permalink
Merge pull request #71 from theotime2005/change-ci
Browse files Browse the repository at this point in the history
[TECH] Change CI and versioning
  • Loading branch information
theotime2005 authored Jan 22, 2025
2 parents 51a1a92 + b440287 commit 1754999
Show file tree
Hide file tree
Showing 8 changed files with 2,206 additions and 265 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/Merge into production.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
name: Merge main into production on tag push

on:
push:
tags:
- 'v*.*.*' # Déclenche le workflow pour les tags correspondant au schéma v*.*.*

permissions:
contents: write

jobs:
merge-main-into-production:
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0 # Nécessaire pour récupérer tous les tags

- name: Set up Git
run: |
git config --global user.email "[email protected]"
git config --global user.name "bnote-auto-merge"
- name: Merge main into production
run: |
git checkout production
git merge main --no-ff -m "Merge branch 'main' into 'production'"
- name: Push changes
run: |
git push origin production
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/PR Title Check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

- name: Validate PR title
run: |
if [[ ! "$(echo '${{ github.event.pull_request.title }}' | grep -E '^\[(BUGFIX|MINORFEATURE|MAJORFEATURE|TECH)\]')" ]]; then
echo "Error: Pull request title must start with [BUGFIX], [MINORFEATURE], [TECH], or [MAJORFEATURE]."
if [[ ! "$(echo '${{ github.event.pull_request.title }}' | grep -E '^\[(BUGFIX|FEATURE|TECH|deps-dev|DOC|BUMP)\]')" ]]; then
echo "Error: Pull request title must start with [BUGFIX], [TECH], [DOC], [BUMP] or [FEATURE]."
exit 1
fi
46 changes: 0 additions & 46 deletions .github/workflows/Update packages.yml

This file was deleted.

51 changes: 0 additions & 51 deletions .github/workflows/Update version on merge.yml

This file was deleted.

5 changes: 3 additions & 2 deletions Contribution guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ Afterwards, you can develop your feature or resolve the issue. Follow this next
## Create a pull request
To suggest your modification to the repository owner, you must open a pull request. In the title, precize the type of pull request. The scopes are:
- [BUGFIX] to resolve an issue or a lag,
- [MINORFEATURE] to suggest a minor fonctionality update,
- [MAJORFEATURE] to suggest a major fonctionality update,
- [FEATURE] to create a new feature,
- [DOC When you want writing docs,
- [BUMP] When you update a specific dependency,
- [TECH] To correct a fonctionnality (workflow, method call or other).
In the description, you must complete the problem and solution sections. An optionnal note exists if you want to add any information.

Expand Down
Loading

0 comments on commit 1754999

Please sign in to comment.