Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into to_public
Browse files Browse the repository at this point in the history
  • Loading branch information
banrieen committed Sep 28, 2020
2 parents 48af688 + 048fcd4 commit 8703687
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/sync_public_when_pushed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,12 @@ jobs:
steps:
- name: update repo
run: |
cd ..
git clone -b to_public https://banrieen:[email protected]/apulis/DLWorkspace.git
cd DLWorkspace
git config --global user.email "[email protected]"
git config --global user.name "banrieen"
git pull
git merge origin/develop -X theirs --no-ff
ls -la
git push origin to_public
cd ..
rm -rf DLWorkspace
sync-repo:
runs-on: ubuntu-latest
steps:
Expand Down

0 comments on commit 8703687

Please sign in to comment.