From 451136ea64392afd2b75a62c72111877465cfa5f Mon Sep 17 00:00:00 2001 From: hsw Date: Mon, 15 Jul 2024 09:55:32 +0900 Subject: [PATCH] gihub: Update actions --- .github/workflows/build.yml | 34 ++++++++----------- .../workflows/gradle-wrapper-validation.yml | 16 +++++++++ 2 files changed, 30 insertions(+), 20 deletions(-) create mode 100644 .github/workflows/gradle-wrapper-validation.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c053e26..3f1b912 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,51 +12,45 @@ permissions: contents: read jobs: - # https://github.com/gradle/wrapper-validation-action # https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/6f09cf79b1a18850e88897a54c1e39ef167b803a/.github/workflows/build-common.yml#L49C1-L55C54 - gradle-wrapper-validation: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: gradle/wrapper-validation-action@v1.0.6 - build: runs-on: ubuntu-latest - needs: gradle-wrapper-validation - steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' java-version: 21 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2 + with: + validate-wrappers: true + - name: Inspect environment run: | env - name: Build - uses: gradle/gradle-build-action@v2.9.0 - with: - arguments: assemble testClasses --exclude-task bootJar + run: ./gradlew assemble testClasses --exclude-task bootJar test: runs-on: ubuntu-latest needs: build steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 - name: Set up JDK - uses: actions/setup-java@v3 + uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1 with: distribution: 'temurin' - check-latest: true java-version: 21 + - name: Setup Gradle + uses: gradle/actions/setup-gradle@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2 + - name: Test - uses: gradle/gradle-build-action@v2.9.0 - with: - arguments: test --continue + run: ./gradlew --continue test diff --git a/.github/workflows/gradle-wrapper-validation.yml b/.github/workflows/gradle-wrapper-validation.yml new file mode 100644 index 0000000..4b50118 --- /dev/null +++ b/.github/workflows/gradle-wrapper-validation.yml @@ -0,0 +1,16 @@ +# https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions + +name: "Validate Gradle Wrapper" + +on: + push: + pull_request: + +jobs: + # https://github.com/gradle/wrapper-validation-action + # https://github.com/open-telemetry/opentelemetry-java-instrumentation/blob/6f09cf79b1a18850e88897a54c1e39ef167b803a/.github/workflows/build-common.yml#L49C1-L55C54 + gradle-wrapper-validation: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 + - uses: gradle/actions/wrapper-validation@dbbdc275be76ac10734476cc723d82dfe7ec6eda # v3.4.2