From fc6bbc9b08b31ab63737aee4321d7d89a7c5c4c4 Mon Sep 17 00:00:00 2001 From: micronaut-build <65172877+micronaut-build@users.noreply.github.com> Date: Mon, 12 Apr 2021 10:56:46 -0500 Subject: [PATCH] [acme] Update common files for branch master (#131) --- .github/workflows/central-sync.yml | 5 +++-- .github/workflows/dependency-update.yml | 5 +++-- .github/workflows/graalvm.yml | 21 ++++++++++++++++----- .github/workflows/gradle.yml | 14 +++++++++++--- .github/workflows/publish-snapshot.yml | 3 ++- .github/workflows/release.yml | 5 +++-- gradle/wrapper/gradle-wrapper.properties | 2 +- 7 files changed, 39 insertions(+), 16 deletions(-) diff --git a/.github/workflows/central-sync.yml b/.github/workflows/central-sync.yml index 5dc50667..0c6fd36d 100644 --- a/.github/workflows/central-sync.yml +++ b/.github/workflows/central-sync.yml @@ -20,9 +20,10 @@ jobs: ref: v${{ github.event.inputs.release_version }} - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '8' - name: Publish to Sonatype OSSRH env: SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }} diff --git a/.github/workflows/dependency-update.yml b/.github/workflows/dependency-update.yml index 25ef433f..a95012b3 100644 --- a/.github/workflows/dependency-update.yml +++ b/.github/workflows/dependency-update.yml @@ -19,9 +19,10 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '8' - name: Export Gradle Properties uses: micronaut-projects/github-actions/export-gradle-properties@master - name: Check Dependencies diff --git a/.github/workflows/graalvm.yml b/.github/workflows/graalvm.yml index f163a66b..0d255bd5 100644 --- a/.github/workflows/graalvm.yml +++ b/.github/workflows/graalvm.yml @@ -1,3 +1,8 @@ +# WARNING: Do not edit this file directly. Instead, go to: +# +# https://github.com/micronaut-projects/micronaut-project-template/tree/master/.github/workflows +# +# and edit them there. Note that it will be sync'ed to all the Micronaut repos name: GraalVM CE CI on: push: @@ -14,8 +19,15 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - graalvm: ['20.3.0.java8', '20.3.0.java11'] + graalvm: ['21.0.0.2.java8', '21.0.0.2.java11'] steps: + # https://github.com/actions/virtual-environments/issues/709 + - name: Free disk space + run: | + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + sudo apt-get clean + df -h - uses: actions/checkout@v2 - uses: actions/cache@v2.1.4 with: @@ -24,19 +36,18 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Setup GraalVM CE - uses: DeLaGuardo/setup-graalvm@3.1 + uses: DeLaGuardo/setup-graalvm@4.0 with: graalvm-version: ${{ matrix.graalvm }} - name: Install Native Image run: gu install native-image - name: Build with Gradle run: | - if ./gradlew tasks --all | grep -w "testNativeImage" + if ./gradlew tasks --no-daemon --all | grep -w "testNativeImage" then ./gradlew check testNativeImage --continue --no-daemon else ./gradlew check --continue --no-daemon fi env: - TESTCONTAINERS_RYUK_DISABLED: true - + TESTCONTAINERS_RYUK_DISABLED: true \ No newline at end of file diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index bbaed83d..1f02bb93 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -21,6 +21,13 @@ jobs: matrix: java: ['8', '11', '15'] steps: + # https://github.com/actions/virtual-environments/issues/709 + - name: Free disk space + run: | + sudo rm -rf "/usr/local/share/boost" + sudo rm -rf "$AGENT_TOOLSDIRECTORY" + sudo apt-get clean + df -h - uses: actions/checkout@v2 - uses: actions/cache@v2.1.4 with: @@ -29,16 +36,17 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: ${{ matrix.java }} - name: Optional setup step run: | [ -f ./setup.sh ] && ./setup.sh || true - name: Build with Gradle - run: ./gradlew dependencyUpdates check --parallel --continue + run: ./gradlew dependencyUpdates check --no-daemon --parallel --continue env: - TESTCONTAINERS_RYUK_DISABLED: true + TESTCONTAINERS_RYUK_DISABLED: true - name: Publish to Sonatype Snapshots if: success() && github.event_name == 'push' && matrix.java == '8' env: diff --git a/.github/workflows/publish-snapshot.yml b/.github/workflows/publish-snapshot.yml index 44ebc800..91baf914 100644 --- a/.github/workflows/publish-snapshot.yml +++ b/.github/workflows/publish-snapshot.yml @@ -18,8 +18,9 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: + distribution: 'adopt' java-version: '8' - name: Publish to Sonatype Snapshots if: success() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74f5392f..42c206b4 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -17,9 +17,10 @@ jobs: token: ${{ secrets.GH_TOKEN }} - uses: gradle/wrapper-validation-action@v1 - name: Set up JDK - uses: actions/setup-java@v1 + uses: actions/setup-java@v2 with: - java-version: 1.8 + distribution: 'adopt' + java-version: '8' - name: Set the current release version id: release_version run: echo ::set-output name=release_version::${GITHUB_REF:11} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a563242..442d9132 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists