Skip to content

Commit aad2c62

Browse files
fix
1 parent 2ac324a commit aad2c62

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

.github/workflows/github-actions-deploy.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,30 @@ jobs:
1111
run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event. "
1212
- run: echo "🐧 This job is now running on a ${{ runner.os }} server hosted by GitHub!"
1313
- 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
1517
uses: actions/checkout@v1
1618
with:
1719
repository: creativetimofficial/paper-dashboard-laravel
1820
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
1932
- name: Configure git
2033
run: |
2134
git config --global user.name "CI Bot"
2235
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
3239
shell: bash
3340
- run: echo "The fork was updated"

readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# test 7[Paper Dashboard Laravel - Free Frontend Preset for Laravel](https://www.creative-tim.com/live/paper-dashboard-laravel/?ref=adnp-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Paper%20Dashboard%20Laravel%20is%20a%20Free%20Frontend%20Preset%20for%20Laravel%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//paper-dashboard-laravel.creative-tim.com/%20%23%paper%20%23design%20%23dashboard%20%23laravel%20%23free%20via%20%40CreativeTim)
1+
# test 8[Paper Dashboard Laravel - Free Frontend Preset for Laravel](https://www.creative-tim.com/live/paper-dashboard-laravel/?ref=adnp-readme) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Paper%20Dashboard%20Laravel%20is%20a%20Free%20Frontend%20Preset%20for%20Laravel%20%E2%9D%A4%EF%B8%8F%0Ahttps%3A//paper-dashboard-laravel.creative-tim.com/%20%23%paper%20%23design%20%23dashboard%20%23laravel%20%23free%20via%20%40CreativeTim)
22

33
![version](https://img.shields.io/badge/version-1.0.1-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/laravel-frontend-presets/paper-dashboard.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/paper-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/laravel-frontend-presets/paper-dashboard.svg?maxAge=2592000)](https://github.com/laravel-frontend-presets/paper-dashboard/issues?q=is%3Aissue+is%3Aclosed)
44

0 commit comments

Comments
 (0)