@@ -11,23 +11,30 @@ jobs:
11
11
run : echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event. "
12
12
- run : echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
13
13
- run : echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
14
- - name : Checkout
14
+ - run : mkdir ct_folder
15
+ - run : cd ct_folder
16
+ - name : Checkout ct
15
17
uses : actions/checkout@v1
16
18
with :
17
19
repository : creativetimofficial/paper-dashboard-laravel
18
20
token : ${{ secrets.CT_TOKEN }}
21
+ - run : cd ..
22
+ - run : mkdir preset_folder
23
+ - run : cd preset_folder
24
+ - name : Checkout preset
25
+ uses : actions/checkout@v1
26
+ with :
27
+ repository : laravel-frontend-presets/paper-dashboard
28
+ token : ${{ secrets.CT_TOKEN }}
29
+ - run : cd ..
30
+ - run : rsync -av --progress ct_folder /preset_folder --exclude .git
31
+ - run : cd preset_folder
19
32
- name : Configure git
20
33
run : |
21
34
git config --global user.name "CI Bot"
22
35
git config --global user.email "[email protected] "
23
- git remote add upstream https://${{ secrets.CT_TOKEN }}@github.com/laravel-frontend-presets/paper-dashboard
24
- shell : bash
25
- - name : Fetch and merge
26
- id : fetch-merge
27
- run : |
28
- git fetch upstream
29
- git checkout upstream/master
30
- git merge origin/master
31
- git push upstream HEAD:master --force
36
+ git add .
37
+ git commit -m "merge with fork"
38
+ git push origin HEAD:master --force
32
39
shell : bash
33
40
- run : echo "The fork was updated"
0 commit comments