Spaces:
Running
Running
Merge branch 'master' into main
Browse files
.github/workflows/train-deploy.yaml
CHANGED
@@ -33,10 +33,14 @@ jobs:
|
|
33 |
- name: Merge PR changes into main
|
34 |
run: |
|
35 |
git checkout "master" # Switch to main branch
|
36 |
-
git pull origin
|
37 |
git merge --no-ff origin/main -m "Merging PR changes from master"
|
38 |
git push origin master # Push merged changes to main
|
39 |
|
|
|
|
|
|
|
|
|
40 |
- name: Deploy to Hugging Face
|
41 |
env:
|
42 |
HF_TOKEN: ${{ secrets.HUGGINGFACE_API_TOKEN }}
|
|
|
33 |
- name: Merge PR changes into main
|
34 |
run: |
|
35 |
git checkout "master" # Switch to main branch
|
36 |
+
git pull origin master # Ensure latest changes
|
37 |
git merge --no-ff origin/main -m "Merging PR changes from master"
|
38 |
git push origin master # Push merged changes to main
|
39 |
|
40 |
+
git checkout "master" # Switch to master branch
|
41 |
+
git pull origin master # Ensure latest master
|
42 |
+
git merge --no-ff origin/main -m "Merging latest changes from main"
|
43 |
+
git push origin master # Push changes to master
|
44 |
- name: Deploy to Hugging Face
|
45 |
env:
|
46 |
HF_TOKEN: ${{ secrets.HUGGINGFACE_API_TOKEN }}
|