Spaces:
Configuration error
Configuration error
Merge remote-tracking branch 'origin/develop'
Browse files
.github/workflows/ci-cd.yml
CHANGED
@@ -25,9 +25,6 @@ jobs:
|
|
25 |
with:
|
26 |
python-version: 3.9
|
27 |
|
28 |
-
- name: Install Dependencies
|
29 |
-
run: pip install -r requirements.txt
|
30 |
-
|
31 |
- name: Run Tests
|
32 |
run: python -m unittest discover -s tests
|
33 |
|
@@ -68,7 +65,7 @@ jobs:
|
|
68 |
merge-to-main:
|
69 |
needs: merge-to-develop
|
70 |
runs-on: ubuntu-latest
|
71 |
-
if:
|
72 |
steps:
|
73 |
- name: Checkout Repository
|
74 |
uses: actions/checkout@v3
|
@@ -86,4 +83,4 @@ jobs:
|
|
86 |
git fetch origin
|
87 |
git checkout main
|
88 |
git merge --no-ff origin/develop
|
89 |
-
git push origin main
|
|
|
25 |
with:
|
26 |
python-version: 3.9
|
27 |
|
|
|
|
|
|
|
28 |
- name: Run Tests
|
29 |
run: python -m unittest discover -s tests
|
30 |
|
|
|
65 |
merge-to-main:
|
66 |
needs: merge-to-develop
|
67 |
runs-on: ubuntu-latest
|
68 |
+
if: success()
|
69 |
steps:
|
70 |
- name: Checkout Repository
|
71 |
uses: actions/checkout@v3
|
|
|
83 |
git fetch origin
|
84 |
git checkout main
|
85 |
git merge --no-ff origin/develop
|
86 |
+
git push origin main
|