From 4ac08f813550ac01cb1ed7a2e4359b87d692c8a8 Mon Sep 17 00:00:00 2001 From: Kengo TODA Date: Wed, 2 Mar 2022 10:21:35 +0800 Subject: [PATCH 1/3] ci: enable the dependency cache supported by actions/setup-java https://github.blog/changelog/2021-08-30-github-actions-setup-java-now-supports-dependency-caching/ --- .github/workflows/build.yml | 10 ++-------- .github/workflows/publish.yml | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d316670..a674baf 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,16 +8,10 @@ jobs: steps: - name: Git checkout uses: actions/checkout@v2 - - name: Configure Gradle cache - uses: actions/cache@v1 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: | - ${{ runner.os }}-gradle- - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 + cache: gradle - name: Build with Gradle run: ./gradlew build --scan diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index c4e4957..1d7e0da 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,17 +11,11 @@ jobs: steps: - name: Git checkout uses: actions/checkout@v2 - - name: Configure Gradle cache - uses: actions/cache@v1 - with: - path: ~/.gradle/caches - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} - restore-keys: | - ${{ runner.os }}-gradle- - name: Set up JDK 11 - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: java-version: 11 + cache: gradle - name: Create gradle.properties run: echo -e "gradle.publish.key=$GRADLE_PUBLISH_KEY\ngradle.publish.secret=$GRADLE_PUBLISH_SECRET" > gradle.properties - name: Build with Gradle From 51ccd67c9d020b899c4ac36f24ea374c1da23d7d Mon Sep 17 00:00:00 2001 From: Kengo TODA Date: Wed, 2 Mar 2022 10:22:32 +0800 Subject: [PATCH 2/3] ci: bump up actions/checkout to use the latest Node.JS as its runtime https://github.com/actions/checkout/releases/tag/v3.0.0 --- .github/workflows/build.yml | 2 +- .github/workflows/publish.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a674baf..8dd3542 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -7,7 +7,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Git checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 uses: actions/setup-java@v2 with: diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 1d7e0da..f9c410d 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -10,7 +10,7 @@ jobs: GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }} steps: - name: Git checkout - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Set up JDK 11 uses: actions/setup-java@v2 with: From ff2ddcd65c74c3484a140d32c5e4fc26333b6994 Mon Sep 17 00:00:00 2001 From: Kengo TODA Date: Wed, 2 Mar 2022 11:39:38 +0800 Subject: [PATCH 3/3] ci: add missing `distribution` params --- .github/workflows/build.yml | 3 ++- .github/workflows/publish.yml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8dd3542..dedcc7d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,8 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 11 cache: gradle + distribution: microsoft + java-version: 11 - name: Build with Gradle run: ./gradlew build --scan diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index f9c410d..7faf581 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -14,8 +14,9 @@ jobs: - name: Set up JDK 11 uses: actions/setup-java@v2 with: - java-version: 11 cache: gradle + distribution: microsoft + java-version: 11 - name: Create gradle.properties run: echo -e "gradle.publish.key=$GRADLE_PUBLISH_KEY\ngradle.publish.secret=$GRADLE_PUBLISH_SECRET" > gradle.properties - name: Build with Gradle