Skip to content

Commit

Permalink
Merge pull request #4 from algosup/tests
Browse files Browse the repository at this point in the history
Tests into main branch

+ Deleting useless files
+ Updating the mail.yml
  • Loading branch information
EnoGame29 authored Feb 27, 2025
2 parents 23e220b + eaad29a commit 5c20a4f
Show file tree
Hide file tree
Showing 5 changed files with 30 additions and 14 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ assignees: ''



|**Concerned test case**|**Bug discovery date**|**Bug severity**|
|-----------------------|----------------------|---------------------|
| | |
| **Concerned test case** | **Bug discovery date** | **Bug severity** |
| ----------------------- | ---------------------- | ---------------- |
| | | |

---

Expand Down
3 changes: 1 addition & 2 deletions .github/ISSUE_TEMPLATE/test-case.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---
name: Test Case
about: Write a test case to test the code
about: Create a test to check if the code works
title: 'Test Case #*test case number*:*test case description*'
labels: test case
assignees: ''

---

# Test case #[Number]:[Test case name]
Expand Down
35 changes: 26 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,48 @@ on:
branches:
- main

permissions:
contents: write

jobs:
auto-merge:
runs-on: ubuntu-latest
steps:
- name: Checkout main branch
uses: actions/checkout@v2
with:
ref: main
fetch-depth: 0 # Recover all history
fetch-depth: 0

- name: Configure Git
run: |
git config --global user.name 'github-actions[bot]'
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
- name: Fetch all branches
run: git fetch --all
run: |
git fetch --prune --all
- name: Merge main into sub-branches
run: |
for branch in origin/functional origin/technical origin/quality-assurance origin/management origin/dev; do
if git show-ref --verify --quiet refs/heads/$branch; then
git checkout $branch
git merge --no-edit main || (echo "Merge conflict in $branch, please resolve manually." && exit 1)
git push origin $branch
for branch in functional technical dev quality-assurance management; do
echo "Checking branch: $branch"
if git ls-remote --heads origin "$branch" | grep -q "refs/heads/$branch"; then
echo "Branch $branch exists, proceeding..."
if git show-ref --verify --quiet "refs/heads/$branch"; then
git checkout "$branch"
else
git checkout -b "$branch" "origin/$branch"
fi
if git merge --no-edit main; then
git push origin "$branch"
else
echo "Merge conflict in $branch, please resolve manually."
exit 1
fi
else
echo "Branch $branch does not exist, skipping."
echo "Branch $branch does not exist on origin, skipping."
fi
done
Empty file removed documents/display document folder
Empty file.
Empty file removed src/display src folder
Empty file.

0 comments on commit 5c20a4f

Please sign in to comment.