From 471ab22e6fb416d3b38900b1dd8464fb034ec03c Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 22 Feb 2022 15:01:36 +0800 Subject: [PATCH] Merge duplicated wrapper-validation actions (#7103) --- .github/workflows/build.yml | 55 +++---------------- .../workflows/gradle-wrapper-validation.yml | 10 ---- 2 files changed, 7 insertions(+), 58 deletions(-) delete mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6cd8883102c7..e1e13b15c90a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,9 +19,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -43,6 +40,13 @@ jobs: ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }} ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }} + validation: + name: "Validation" + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: gradle/wrapper-validation-action@v1 + checkjdk11: runs-on: ubuntu-latest @@ -50,9 +54,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -76,9 +77,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -108,9 +106,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -141,9 +136,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -168,9 +160,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -195,9 +184,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Install Old JDK 8 uses: actions/setup-java@v2 with: @@ -228,9 +214,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -255,9 +238,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -282,9 +262,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -310,9 +287,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -337,9 +311,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -365,9 +336,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -394,9 +362,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -435,9 +400,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: @@ -494,9 +456,6 @@ jobs: - name: Checkout uses: actions/checkout@v2 - - name: Validate Gradle Wrapper - uses: gradle/wrapper-validation-action@v1 - - name: Configure JDK uses: actions/setup-java@v2 with: diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml deleted file mode 100644 index f552c8dc6542..000000000000 --- a/.github/workflows/gradle-wrapper-validation.yml +++ /dev/null @@ -1,10 +0,0 @@ -name: "Validate Gradle Wrapper" -on: [push] - -jobs: - validation: - name: "Validation" - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: gradle/wrapper-validation-action@v1