|
|
|
|
@ -19,8 +19,8 @@ jobs:
|
|
|
|
|
|
|
|
|
|
- name: Pull changes from FluffyChat
|
|
|
|
|
run: |
|
|
|
|
|
git config --global user.email "${{ secrets.CI_EMAIL }}"
|
|
|
|
|
git config --global user.name "${{ secrets.CI_USERNAME }}"
|
|
|
|
|
git config --global user.email "${{ vars.CI_EMAIL }}"
|
|
|
|
|
git config --global user.name "${{ vars.CI_USERNAME }}"
|
|
|
|
|
git remote add fluffychat https://github.com/krille-chan/fluffychat
|
|
|
|
|
git fetch fluffychat main
|
|
|
|
|
git merge --no-edit fluffychat/main --allow-unrelated-histories
|
|
|
|
|
|