diff --git a/.github/workflows/auto_pull_request.yaml b/.github/workflows/auto_pull_request.yaml index d35521e24..cf6bb228c 100644 --- a/.github/workflows/auto_pull_request.yaml +++ b/.github/workflows/auto_pull_request.yaml @@ -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: | diff --git a/lib/pangea/pages/analytics/construct_cloud.dart b/lib/pangea/pages/analytics/construct_cloud.dart index 67bdb02c9..a4aeb9cc1 100644 --- a/lib/pangea/pages/analytics/construct_cloud.dart +++ b/lib/pangea/pages/analytics/construct_cloud.dart @@ -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';