From 003439350cd763f34a767a0189be24321bb11957 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 01:32:01 +0800 Subject: [PATCH 1/6] patch: update --- .github/workflows/code-check.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index cc4bae7..ebfdd4c 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -31,4 +31,6 @@ jobs: uses: super-linter/super-linter@v6.3.1 env: GITHUB_TOKEN: ${{ secrets.MyGitHubToken }} - CHECKSTYLE_FILTER_PATH: ".github/workflows/checkstyle.xml" \ No newline at end of file + JAVA_FILE_NAME: ".github/workflows/checkstyle.xml" + IGNORE_GITIGNORED_FILES: true + VALIDATE_GOOGLE_JAVA_FORMAT: false \ No newline at end of file -- 2.43.0 From 2859a1f70e1df2b18a77ee0ba74e51b338deac4e Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 01:55:35 +0800 Subject: [PATCH 2/6] patch: test --- .github/workflows/code-check.yaml | 44 +++++-------------- .../checkstyle.xml => checkstyle.xml | 0 2 files changed, 12 insertions(+), 32 deletions(-) rename .github/workflows/checkstyle.xml => checkstyle.xml (100%) diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index ebfdd4c..ae809db 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -1,36 +1,16 @@ -name: 代码检查 - -on: - push: - branches: - - master - pull_request: - branches: - - master - - develop +on: pull_request jobs: - build: - name: 代码检查 - runs-on: ubuntu-22.04 - - permissions: - contents: read - packages: read - statuses: write - + checkstyle_job: + runs-on: ubuntu-latest + name: Checkstyle job steps: - - name: Checkout code - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v2 + - name: Run check style + uses: nikitasavinov/checkstyle-action@master with: - # super-linter needs the full git history to get the - # list of files that changed across commits - fetch-depth: 0 - - - name: Super-linter - uses: super-linter/super-linter@v6.3.1 - env: - GITHUB_TOKEN: ${{ secrets.MyGitHubToken }} - JAVA_FILE_NAME: ".github/workflows/checkstyle.xml" - IGNORE_GITIGNORED_FILES: true - VALIDATE_GOOGLE_JAVA_FORMAT: false \ No newline at end of file + github_token: ${{ MyGitHubToken.GITHUB_TOKEN }} + reporter: 'github-pr-check' + tool_name: 'testtool' + checkstyle_config: 'checkstyle.xml' \ No newline at end of file diff --git a/.github/workflows/checkstyle.xml b/checkstyle.xml similarity index 100% rename from .github/workflows/checkstyle.xml rename to checkstyle.xml -- 2.43.0 From 7035ad0104cf28cb083510b471a000dc3835f7e9 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 02:08:19 +0800 Subject: [PATCH 3/6] patch: test --- checkstyle.xml | 34 +++++----------------------------- 1 file changed, 5 insertions(+), 29 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index 56a7b46..b0f3646 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -16,14 +16,6 @@ - - - - - - - - @@ -31,19 +23,12 @@ - - + - - - - - - @@ -78,9 +63,9 @@ - + - + @@ -139,15 +124,8 @@ - - - - - - - @@ -159,8 +137,6 @@ - - - + @@ -205,4 +181,4 @@ - + \ No newline at end of file -- 2.43.0 From fecda5d5042161e6399ead3648194be4476d5b83 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 02:09:00 +0800 Subject: [PATCH 4/6] patch: test --- checkstyle.xml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/checkstyle.xml b/checkstyle.xml index b0f3646..5a5e9d2 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -13,6 +13,12 @@ + + + + + + @@ -62,11 +68,6 @@ - - - - - -- 2.43.0 From 76724994d4938e67da9470799d2b176a6883a445 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 02:09:47 +0800 Subject: [PATCH 5/6] patch: test --- .github/workflows/code-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index ae809db..936ba38 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -10,7 +10,7 @@ jobs: - name: Run check style uses: nikitasavinov/checkstyle-action@master with: - github_token: ${{ MyGitHubToken.GITHUB_TOKEN }} + github_token: ${{ MyGitHubToken.MYGITHUBTOKEN }} reporter: 'github-pr-check' tool_name: 'testtool' checkstyle_config: 'checkstyle.xml' \ No newline at end of file -- 2.43.0 From 75c8ea3c8bf09b0b494b2cf50a8cb8c113033ffc Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Wed, 10 Apr 2024 02:10:39 +0800 Subject: [PATCH 6/6] patch: test --- .github/workflows/code-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index 936ba38..fc049d7 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -10,7 +10,7 @@ jobs: - name: Run check style uses: nikitasavinov/checkstyle-action@master with: - github_token: ${{ MyGitHubToken.MYGITHUBTOKEN }} + github_token: ${{ secrets.MyGitHubToken }} reporter: 'github-pr-check' tool_name: 'testtool' checkstyle_config: 'checkstyle.xml' \ No newline at end of file -- 2.43.0