From 4cf670a4d09020e4ec85af494ea3c8b0b740a28c Mon Sep 17 00:00:00 2001 From: LamGC Date: Fri, 30 Aug 2024 08:45:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?build(action):=20=E5=B0=86=20gradle/gradle-?= =?UTF-8?q?build-action@v3.1.0=20=E8=BF=81=E7=A7=BB=E8=87=B3=20gradle/acti?= =?UTF-8?q?ons/setup-gradle@v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/binary-compatibility-verification.yml | 8 +++----- .github/workflows/build-and-test.yml | 8 +++----- .github/workflows/create-release.yml | 7 +++---- .github/workflows/publish-artifacts.yml | 8 +++----- .github/workflows/release-dev-container-image.yml | 8 +++----- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/.github/workflows/binary-compatibility-verification.yml b/.github/workflows/binary-compatibility-verification.yml index 9614c2e..0326a58 100644 --- a/.github/workflows/binary-compatibility-verification.yml +++ b/.github/workflows/binary-compatibility-verification.yml @@ -25,12 +25,10 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - cache: 'gradle' - uses: gradle/actions/wrapper-validation@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and run binary compatibility verification - uses: gradle/gradle-build-action@v3.1.0 - with: - gradle-version: 'wrapper' - arguments: apiCheck + run: ./gradlew apiCheck diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 02db987..df86918 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -24,12 +24,10 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - cache: 'gradle' - uses: gradle/actions/wrapper-validation@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and test - uses: gradle/gradle-build-action@v3.1.0 - with: - gradle-version: 'wrapper' - arguments: test + run: ./gradlew clean test diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 754f68d..a30ca6d 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -44,15 +44,14 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - cache: 'gradle' - uses: gradle/actions/wrapper-validation@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and test uses: gradle/gradle-build-action@v3.1.0 - with: - gradle-version: 'wrapper' - arguments: clean test assembleDist + run: ./gradlew clean test assembleDist # 创建新的发行版本 - name: Create Release diff --git a/.github/workflows/publish-artifacts.yml b/.github/workflows/publish-artifacts.yml index ec892af..0ddac96 100644 --- a/.github/workflows/publish-artifacts.yml +++ b/.github/workflows/publish-artifacts.yml @@ -20,15 +20,13 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - cache: 'gradle' - uses: gradle/actions/wrapper-validation@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and test - uses: gradle/gradle-build-action@v3.1.0 - with: - gradle-version: 'wrapper' - arguments: clean test installDist + run: ./gradlew clean test installDist - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker BuildX diff --git a/.github/workflows/release-dev-container-image.yml b/.github/workflows/release-dev-container-image.yml index 92241d5..36e2d3f 100644 --- a/.github/workflows/release-dev-container-image.yml +++ b/.github/workflows/release-dev-container-image.yml @@ -20,15 +20,13 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - cache: 'gradle' - uses: gradle/actions/wrapper-validation@v3 + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v3 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build project and install Distribution package - uses: gradle/gradle-build-action@v3.1.0 - with: - gradle-version: 'wrapper' - arguments: installDist + run: ./gradlew clean test installDist - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker BuildX From cc7ef37539f05bd58e8367defa9840fe6c454b21 Mon Sep 17 00:00:00 2001 From: LamGC Date: Fri, 30 Aug 2024 08:52:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?build(action):=20=E7=A7=BB=E9=99=A4=20gradl?= =?UTF-8?q?e/actions/wrapper-validation=20=E5=B9=B6=E5=B0=86=20gradle/acti?= =?UTF-8?q?ons/setup-gradle=20=E5=8D=87=E7=BA=A7=E8=87=B3=20v4=20=E7=89=88?= =?UTF-8?q?=E6=9C=AC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/binary-compatibility-verification.yml | 3 +-- .github/workflows/build-and-test.yml | 3 +-- .github/workflows/create-release.yml | 3 +-- .github/workflows/publish-artifacts.yml | 3 +-- .github/workflows/release-dev-container-image.yml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/.github/workflows/binary-compatibility-verification.yml b/.github/workflows/binary-compatibility-verification.yml index 0326a58..99248e8 100644 --- a/.github/workflows/binary-compatibility-verification.yml +++ b/.github/workflows/binary-compatibility-verification.yml @@ -25,9 +25,8 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - - uses: gradle/actions/wrapper-validation@v3 - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and run binary compatibility verification diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index df86918..d2230b6 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -24,9 +24,8 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - - uses: gradle/actions/wrapper-validation@v3 - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and test diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index a30ca6d..d787906 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -44,9 +44,8 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - - uses: gradle/actions/wrapper-validation@v3 - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and test diff --git a/.github/workflows/publish-artifacts.yml b/.github/workflows/publish-artifacts.yml index 0ddac96..6a53fc4 100644 --- a/.github/workflows/publish-artifacts.yml +++ b/.github/workflows/publish-artifacts.yml @@ -20,9 +20,8 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - - uses: gradle/actions/wrapper-validation@v3 - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build and test diff --git a/.github/workflows/release-dev-container-image.yml b/.github/workflows/release-dev-container-image.yml index 36e2d3f..ef0f3f3 100644 --- a/.github/workflows/release-dev-container-image.yml +++ b/.github/workflows/release-dev-container-image.yml @@ -20,9 +20,8 @@ jobs: with: java-version: '11' distribution: 'adopt-hotspot' - - uses: gradle/actions/wrapper-validation@v3 - name: Set up Gradle - uses: gradle/actions/setup-gradle@v3 + uses: gradle/actions/setup-gradle@v4 - name: Grant execute permission for gradlew run: chmod +x gradlew - name: Build project and install Distribution package