From 65c6ee756a05fb5f76fddc9ee92d02df9be5df2b Mon Sep 17 00:00:00 2001 From: bladehan1 Date: Mon, 3 Aug 2026 15:36:54 +0800 Subject: [PATCH] ci: optimize pull request checks --- .github/workflows/pr-build.yml | 66 ++++++------------- .github/workflows/pr-check.yml | 16 ++--- .../java/org/tron/common/utils/ForkUtils.java | 0 .../org/tron/core/config/args/Parameter.java | 0 4 files changed, 24 insertions(+), 58 deletions(-) delete mode 100644 chainbase/src/main/java/org/tron/common/utils/ForkUtils.java delete mode 100644 chainbase/src/main/java/org/tron/core/config/args/Parameter.java diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml index f35538c0961..7e9ed84a34d 100644 --- a/.github/workflows/pr-build.yml +++ b/.github/workflows/pr-build.yml @@ -1,6 +1,11 @@ name: PR Build on: + push: + branches: [ 'develop' ] + paths-ignore: [ '**/*.md', '.gitignore', '**/.gitignore', '.editorconfig', + '.gitattributes', 'docs/**', 'CHANGELOG', '.github/ISSUE_TEMPLATE/**', + '.github/PULL_REQUEST_TEMPLATE/**', '.github/CODEOWNERS' ] pull_request: branches: [ 'master','develop', 'release_**' ] types: [ opened, synchronize, reopened ] @@ -22,7 +27,7 @@ jobs: build-macos: name: Build macos26 (JDK ${{ matrix.java }} / ${{ matrix.arch }}) - if: ${{ github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'macos' }} + if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'macos' }} runs-on: ${{ matrix.runner }} timeout-minutes: 60 strategy: @@ -42,14 +47,8 @@ jobs: java-version: ${{ matrix.java }} distribution: 'temurin' - - name: Cache Gradle packages - uses: actions/cache@v5 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: macos26-${{ matrix.arch }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: macos26-${{ matrix.arch }}-gradle- + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 - name: Build run: ./gradlew clean build --no-daemon @@ -65,7 +64,7 @@ jobs: build-ubuntu: name: Build ubuntu24 (JDK 17 / aarch64) - if: ${{ github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'ubuntu' }} + if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'ubuntu' }} runs-on: ubuntu-24.04-arm timeout-minutes: 60 @@ -81,14 +80,8 @@ jobs: - name: Check Java version run: java -version - - name: Cache Gradle packages - uses: actions/cache@v5 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ubuntu24-aarch64-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: ubuntu24-aarch64-gradle- + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 - name: Build run: ./gradlew clean build --no-daemon @@ -104,7 +97,7 @@ jobs: docker-build-rockylinux: name: Build rockylinux (JDK 8 / x86_64) - if: ${{ github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'rockylinux' }} + if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'rockylinux' }} runs-on: ubuntu-latest timeout-minutes: 60 @@ -129,15 +122,8 @@ jobs: - name: Check Java version run: java -version - - name: Cache Gradle - uses: actions/cache@v5 - with: - path: | - /github/home/.gradle/caches - /github/home/.gradle/wrapper - key: rockylinux-x86_64-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: | - rockylinux-x86_64-gradle- + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 - name: Stop Gradle daemon run: ./gradlew --stop || true @@ -159,7 +145,7 @@ jobs: docker-build-debian11: name: Build debian11 (JDK 8 / x86_64) - if: ${{ github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'debian11' }} + if: ${{ github.event_name == 'push' || github.event_name == 'pull_request' || inputs.job == 'all' || inputs.job == 'debian11' }} runs-on: ubuntu-latest timeout-minutes: 60 @@ -186,15 +172,8 @@ jobs: - name: Check Java version run: java -version - - name: Cache Gradle - uses: actions/cache@v5 - with: - path: | - /github/home/.gradle/caches - /github/home/.gradle/wrapper - key: debian11-x86_64-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: | - debian11-x86_64-gradle- + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 - name: Build run: ./gradlew clean build --no-daemon --no-build-cache @@ -249,15 +228,8 @@ jobs: with: ref: ${{ github.event.pull_request.base.sha }} - - name: Cache Gradle packages - uses: actions/cache@v5 - with: - path: | - /github/home/.gradle/caches - /github/home/.gradle/wrapper - key: coverage-base-x86_64-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: | - coverage-base-x86_64-gradle- + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 - name: Build (base) # Test failures on the base branch are tolerated: merge-order races can diff --git a/.github/workflows/pr-check.yml b/.github/workflows/pr-check.yml index 506a823a4f7..2789ff17063 100644 --- a/.github/workflows/pr-check.yml +++ b/.github/workflows/pr-check.yml @@ -43,11 +43,11 @@ jobs: errors.push(`PR title is too long (${title.length}/72 characters).`); } - // 2. Conventional format check - const conventionalRegex = /^(feat|fix|refactor|docs|style|test|chore|ci|perf|build|revert)(\([^)]+\))?:\s\S.*/; + // 2. Conventional format check (space after the colon is optional) + const conventionalRegex = /^(feat|fix|refactor|docs|style|test|chore|ci|perf|build|revert)(\([^)]+\))?:\s*\S.*/; if (title && !conventionalRegex.test(title)) { errors.push( - 'PR title must follow conventional format: `type(scope): description`\n' + + 'PR title must follow conventional format: `type(scope): description` or `type(scope):description`\n' + ' Allowed types: ' + allowedTypes.map(t => `\`${t}\``).join(', ') + '\n' + ' Example: `feat(tvm): add blob opcodes`' ); @@ -131,14 +131,8 @@ jobs: java-version: '17' distribution: 'temurin' - - name: Cache Gradle packages - uses: actions/cache@v5 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle', '**/gradle-wrapper.properties') }} - restore-keys: ${{ runner.os }}-gradle- + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v6 - name: Run Checkstyle run: ./gradlew :framework:checkstyleMain :framework:checkstyleTest :plugins:checkstyleMain diff --git a/chainbase/src/main/java/org/tron/common/utils/ForkUtils.java b/chainbase/src/main/java/org/tron/common/utils/ForkUtils.java deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/chainbase/src/main/java/org/tron/core/config/args/Parameter.java b/chainbase/src/main/java/org/tron/core/config/args/Parameter.java deleted file mode 100644 index e69de29bb2d..00000000000