Merge branch 'auto-pr' of https://github.com/pangeachat/client into auto-pr

This commit is contained in:
Gabby Gurdin 2024-04-09 09:38:55 -04:00
commit 25d0fe2fb7
2 changed files with 8 additions and 4 deletions

View file

@ -15,13 +15,17 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Test
run: echo ${{ github.head_ref }}.${{ github.sha }}
- name: Pull changes from FluffyChat
run: |
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
git merge --no-edit fluffychat/main
git fetch fluffychat main
git merge --no-edit fluffychat/main --allow-unrelated-histories
- name: Push changes
run: |

View file

@ -1,6 +1,6 @@
import 'package:fluffychat/pangea/pages/analytics/base_analytics.dart';
import 'package:flutter/material.dart';
import 'package:fluffychat/pangea/pages/analytics/base_analytics_page.dart';
import '../../word_cloud/word_cloud_data.dart';
import '../../word_cloud/word_cloud_shape.dart';
import '../../word_cloud/word_cloud_tap.dart';