From eb19a49b1504f8b6a0e2ade29eacccae31475715 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 8 Apr 2024 22:54:43 +0200 Subject: [PATCH 1/4] fix analytics and add git merge cmd --- .github/workflows/auto_pull_request.yaml | 4 ++-- lib/pangea/pages/analytics/construct_cloud.dart | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/auto_pull_request.yaml b/.github/workflows/auto_pull_request.yaml index d35521e24..9ba416156 100644 --- a/.github/workflows/auto_pull_request.yaml +++ b/.github/workflows/auto_pull_request.yaml @@ -20,8 +20,8 @@ jobs: - name: Pull changes from FluffyChat run: | 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'; From 6feda4e3f7b41dabc3420cedb957bd4fd50f413f Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 8 Apr 2024 23:00:39 +0200 Subject: [PATCH 2/4] set identity --- .github/workflows/auto_pull_request.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/auto_pull_request.yaml b/.github/workflows/auto_pull_request.yaml index 9ba416156..687d0abec 100644 --- a/.github/workflows/auto_pull_request.yaml +++ b/.github/workflows/auto_pull_request.yaml @@ -19,6 +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 remote add fluffychat https://github.com/krille-chan/fluffychat git fetch fluffychat main git merge --no-edit fluffychat/main --allow-unrelated-histories From 42c28555cd661542b53b92ea1a6adfbc3d50cebe Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Mon, 8 Apr 2024 23:01:54 +0200 Subject: [PATCH 3/4] set identity2 --- .github/workflows/auto_pull_request.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/auto_pull_request.yaml b/.github/workflows/auto_pull_request.yaml index 687d0abec..f4770d040 100644 --- a/.github/workflows/auto_pull_request.yaml +++ b/.github/workflows/auto_pull_request.yaml @@ -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 From aac96bed3e01a5549343ef3a5bcae351d75b66f3 Mon Sep 17 00:00:00 2001 From: Brord van Wierst Date: Tue, 9 Apr 2024 00:48:21 +0200 Subject: [PATCH 4/4] set identity3 --- .github/workflows/auto_pull_request.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/auto_pull_request.yaml b/.github/workflows/auto_pull_request.yaml index f4770d040..cf6bb228c 100644 --- a/.github/workflows/auto_pull_request.yaml +++ b/.github/workflows/auto_pull_request.yaml @@ -15,7 +15,9 @@ 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: |