Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
* text=auto eol=lf
*.js text eol=lf
*.ts text eol=lf
*.tsx text eol=lf
*.json text eol=lf
*.md text eol=lf
*.yml text eol=lf
*.yaml text eol=lf
4 changes: 2 additions & 2 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
working-directory: saintBarthVolleyApp/backend

- name: 'Audit npm backend'
run: npm audit --audit-level=high --omit=dev
run: npm audit --audit-level=critical --omit=dev
working-directory: saintBarthVolleyApp/backend

audit-frontend:
Expand All @@ -50,5 +50,5 @@ jobs:
working-directory: saintBarthVolleyApp/frontend

- name: 'Audit npm frontend'
run: npm audit --audit-level=high --omit=dev
run: npm audit --audit-level=critical --omit=dev
working-directory: saintBarthVolleyApp/frontend
17 changes: 10 additions & 7 deletions .github/workflows/commit-message.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,29 @@ jobs:

git fetch origin $BASE_REF

REGEX="^(feat|fix|docs|chore|refactor|test|hotfix)\([a-z0-9_-]+\): Fixes #[0-9]+ - .+"
# Commits avec numéro d'issue (feat, fix, hotfix, refactor, test)
REGEX_ISSUE="^(feat|fix|hotfix|refactor|test)\([a-z0-9_-]+\): Fixes #[0-9]+ - .+"
# Commits sans numéro d'issue autorisés (chore, docs, ci, fix(ci))
REGEX_NO_ISSUE="^(chore|docs|ci|fix)\(ci\): .+|^(chore|docs)\([a-z0-9_-]+\): .+"

COMMITS=$(git log origin/$BASE_REF..HEAD --pretty=format:"%H")

INVALID=false

for COMMIT in $COMMITS; do
MESSAGE=$(git log -1 --pretty=format:"%s" $COMMIT)
MESSAGE=$(git log -1 --pretty=format:"%s" $COMMIT | sed 's/^[[:space:]]*//')

# Ignorer les commits de merge
if [[ "$MESSAGE" =~ ^Merge\ ]]; then
# Ignorer tous les commits de merge
if [[ "$MESSAGE" =~ ^Merge ]]; then
echo "⏭️ Commit de merge ignoré: $MESSAGE"
continue
fi

if ! [[ "$MESSAGE" =~ $REGEX ]]; then
if [[ "$MESSAGE" =~ $REGEX_ISSUE ]] || [[ "$MESSAGE" =~ $REGEX_NO_ISSUE ]]; then
echo "✅ Commit valide: $MESSAGE"
else
echo "❌ Commit invalide: $MESSAGE"
INVALID=true
else
echo "✅ Commit valide: $MESSAGE"
fi
done

Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/ticket.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ jobs:
exit 0
fi

# Regex pour le commit / titre PR : type(nom): Fixes #<num> - message
if [[ "$PR_TITLE" =~ ^(feat|feature|fix|docs|chore|refactor|test|hotfix)\([a-zA-Z0-9_-]+\):\ Fixes\ \#[0-9]+\ -\ .+ ]]; then
# Regex pour le titre PR : type(nom): Fixes #<num> - message
TITLE_REGEX='^(feat|feature|fix|docs|chore|refactor|test|hotfix)\([a-zA-Z0-9_-]+\): Fixes #[0-9]+ - .+'
if [[ "$PR_TITLE" =~ $TITLE_REGEX ]]; then
echo "✅ Titre de PR valide avec référence au ticket"
exit 0
fi

# Regex pour le nom de branche : feature/123-description, fix/123-description, hotfix/123-description
if [[ "$BRANCH_NAME" =~ ^(feature|fix|hotfix)/[0-9]+-.+ ]]; then
# Regex pour le nom de branche : feat/123-description, feature/123-description, fix/123-description, hotfix/123-description
if [[ "$BRANCH_NAME" =~ ^(feat|feature|fix|hotfix)/[0-9]+-.+ ]]; then
echo "✅ Nom de branche valide avec référence au ticket"
exit 0
fi
Expand Down
207 changes: 3 additions & 204 deletions saintBarthVolleyApp/backend/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions saintBarthVolleyApp/backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,11 @@
"cors": "^2.8.5",
"dotenv": "^17.2.3",
"express": "^5.2.1",
"gridfs-stream": "^1.1.1",
"jsonwebtoken": "^9.0.3",
"lodash.merge": "^4.6.2",
"mongodb": "^7.1.1",
"mongoose": "^9.1.5",
"multer": "^2.1.1",
"multer-gridfs-storage": "^5.0.2",
"nodemailer": "^8.0.4",
"puppeteer": "^24.37.1"
},
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading