From 045266825dc620263fa9ee90534401b9b515aa24 Mon Sep 17 00:00:00 2001
From: houseme <houseme@outlook.com>
Date: Tue, 24 Dec 2024 18:10:35 +0800
Subject: [PATCH] Update provider.go (#4076)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 ...fork.yml => apply-format-code-on-push.yml} | 42 +++++++++----------
 .github/workflows/golangci-lint.yml           | 33 ---------------
 2 files changed, 19 insertions(+), 56 deletions(-)
 rename .github/workflows/{apple-fix-to-fork.yml => apply-format-code-on-push.yml} (58%)

diff --git a/.github/workflows/apple-fix-to-fork.yml b/.github/workflows/apply-format-code-on-push.yml
similarity index 58%
rename from .github/workflows/apple-fix-to-fork.yml
rename to .github/workflows/apply-format-code-on-push.yml
index 07443d4dad8..d2c67347572 100644
--- a/.github/workflows/apple-fix-to-fork.yml
+++ b/.github/workflows/apply-format-code-on-push.yml
@@ -1,27 +1,25 @@
-name: Apply Fix to Fork
+name: Apply format code on Push
 
 on:
   push:
-  pull_request_target:
-    types: [synchronize]
 
-jobs:
-  apply-fix:
+jobs:      
+  apply-format-code:
     strategy:
       matrix:
         go-version: [ 'stable' ]
-    name: gci-lint
+    name: apply-format-code-by-gci
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout PR code
+      - name: Checkout code
         uses: actions/checkout@v4
+      - name: golangci-lint
+        uses: reviewdog/action-golangci-lint@v2
         with:
-          ref: ${{ github.event.pull_request.head.ref }}
-          repository: ${{ github.event.pull_request.head.repo.full_name }}
-      - name: Print repository information
-        run: |
-          echo "Base repository: ${{ github.event.pull_request.base.repo.full_name }}"
-          echo "Head repository: ${{ github.event.pull_request.head.repo.full_name }}"
+          github_token: ${{ secrets.github_token }}
+          cache: false
+          golangci_lint_flags: "--timeout 2m --config=.golangci.yml -v"
+          level: "warning"
       - name: Setup Golang ${{ matrix.go-version }}
         uses: actions/setup-go@v5
         with:
@@ -43,17 +41,12 @@ jobs:
           -s "prefix(github.com/gogf/gf/example)" \
           ./
       - name: Check for changes
-        # Check if the event is a push or a pull request from a forked repository
-        if: github.event_name == 'push'|| (github.event_name == 'pull_request_target' && github.event.pull_request.head.repo.fork == true)
         run: |
           if [[ -n "$(git status --porcelain)" ]]; then
             echo "HAS_CHANGES=true" >> $GITHUB_ENV
           else
             echo "HAS_CHANGES=false" >> $GITHUB_ENV
-          fi
-      - name: Output all environment variables
-        run: |
-            env          
+          fi         
       - name: Configure Git
         run: |
           if [[ "$HAS_CHANGES" == 'true' ]]; then
@@ -63,8 +56,11 @@ jobs:
             echo "HAS_CHANGES= $HAS_CHANGES "
           fi
       - name: Commit and push changes
-        if: env.HAS_CHANGES == 'true'
         run: |
-          git add .
-          git commit -m "Apply fixes via pull_request_target"
-          git push origin ${{ github.event.pull_request.head.ref }}
+          if [[ "$HAS_CHANGES" == 'true' ]]; then
+            git add .
+            git commit -m "Apply gci import order changes [skip ci]"
+            git push origin ${{ github.event.pull_request.head.ref }}
+          else
+            echo "No change to commit push"
+          fi
diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
index 9be6b9564d8..0bec9449792 100644
--- a/.github/workflows/golangci-lint.yml
+++ b/.github/workflows/golangci-lint.yml
@@ -47,36 +47,3 @@ jobs:
           only-new-issues: true
           github-token: ${{ secrets.GITHUB_TOKEN }}
           args: --timeout 3m0s
-      - name: Install gci
-        run: go install github.com/daixiang0/gci@latest
-      - name: Run gci
-        run: |
-          gci write --custom-order \
-          --skip-generated \
-          --skip-vendor \
-          -s standard \
-          -s blank \
-          -s default \
-          -s dot \
-          -s "prefix(github.com/gogf/gf/v2)" \
-          -s "prefix(github.com/gogf/gf/cmd)" \
-          -s "prefix(github.com/gogf/gf/contrib)" \
-          -s "prefix(github.com/gogf/gf/example)" \
-          ./
-      - name: Check for changes
-        # Check if the event is a push or a pull request from a forked repository
-        if: github.event_name == 'push'|| (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == true)
-        run: |
-          if [[ -n "$(git status --porcelain)" ]]; then
-          echo "HAS_CHANGES=true" >> $GITHUB_ENV
-          else
-          echo "HAS_CHANGES=false" >> $GITHUB_ENV
-          fi
-      - name: Commit and push changes
-        if: env.HAS_CHANGES == 'true'
-        run: |
-          git config --global user.name "github-actions[bot]"
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git add .
-          git commit -m "Apply gci import order changes"
-          git push  origin HEAD:$(git rev-parse --abbrev-ref HEAD)
\ No newline at end of file