You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuweni.apache.org by to...@apache.org on 2023/01/02 23:44:53 UTC
[incubator-tuweni] branch main updated: Upgrade gradle to 7.6 in the docker image and in the build. Use the docker image gradle tool instead of installing the jar on every run.
This is an automated email from the ASF dual-hosted git repository.
toulmean pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-tuweni.git
The following commit(s) were added to refs/heads/main by this push:
new 7146e10f Upgrade gradle to 7.6 in the docker image and in the build. Use the docker image gradle tool instead of installing the jar on every run.
new 331b3335 Merge pull request #475 from atoulme/upgrade_gradle
7146e10f is described below
commit 7146e10f40d8320c6f0637e0d734edfaa69a129a
Author: Antoine Toulme <an...@lunar-ocean.com>
AuthorDate: Mon Jan 2 15:07:47 2023 -0800
Upgrade gradle to 7.6 in the docker image and in the build. Use the docker image gradle tool instead of installing the jar on every run.
---
.github/workflows/assemble.yml | 2 +-
.github/workflows/checks.yml | 2 +-
.github/workflows/docs.yml.disable | 2 +-
.github/workflows/integration-tests.yml | 2 +-
.github/workflows/license-checks.yml | 2 +-
.github/workflows/test.yml | 2 +-
.github/workflows/test_referencetests.yml | 2 +-
build.gradle | 2 +-
gradle/build.Dockerfile | 4 ++--
gradle/wrapper/gradle-wrapper.properties | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/assemble.yml b/.github/workflows/assemble.yml
index f4058eca..91421aa7 100644
--- a/.github/workflows/assemble.yml
+++ b/.github/workflows/assemble.yml
@@ -54,7 +54,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/dependency-versions.gradle') }}
restore-keys: ${{ runner.os }}-m2
- name: gradle assemble
- run: ./gradlew assemble -x test -Psignatory.keyId=38F6C7215DD49C32 -Psigning.gnupg.keyName=38F6C7215DD49C32 -Psigning.gnupg.executable=gpg
+ run: gradle assemble -x test -Psignatory.keyId=38F6C7215DD49C32 -Psigning.gnupg.keyName=38F6C7215DD49C32 -Psigning.gnupg.executable=gpg
env:
ENABLE_SIGNING: true
- name: Upload source distrib
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index ed89d421..afe87fb4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -34,4 +34,4 @@ jobs:
with:
submodules: true
- name: gradle rat spotlessCheck checkNotice
- run: ./gradlew rat spotlessCheck checkNotice
\ No newline at end of file
+ run: gradle rat spotlessCheck checkNotice
\ No newline at end of file
diff --git a/.github/workflows/docs.yml.disable b/.github/workflows/docs.yml.disable
index 4534c817..85b78533 100644
--- a/.github/workflows/docs.yml.disable
+++ b/.github/workflows/docs.yml.disable
@@ -48,7 +48,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/dependency-versions.gradle') }}
restore-keys: ${{ runner.os }}-m2
- name: gradle docs
- run: ./gradlew docs
+ run: gradle docs
- name: Upload docs
uses: actions/upload-artifact@v2
with:
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 75b29188..6e87665d 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -60,7 +60,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/dependency-versions.gradle') }}
restore-keys: ${{ runner.os }}-m2
- name: gradle integrationTest
- run: ./gradlew integrationTest
+ run: gradle integrationTest
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/license-checks.yml b/.github/workflows/license-checks.yml
index 99358038..924ff56c 100644
--- a/.github/workflows/license-checks.yml
+++ b/.github/workflows/license-checks.yml
@@ -32,4 +32,4 @@ jobs:
with:
submodules: true
- name: gradle checkLicense
- run: ./gradlew checkLicense
\ No newline at end of file
+ run: gradle checkLicense
\ No newline at end of file
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index a99758ff..eeb64a72 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -47,7 +47,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/dependency-versions.gradle') }}
restore-keys: ${{ runner.os }}-m2
- name: gradle test
- run: ./gradlew test
+ run: gradle test
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
diff --git a/.github/workflows/test_referencetests.yml b/.github/workflows/test_referencetests.yml
index ac4b6a88..8a89758d 100644
--- a/.github/workflows/test_referencetests.yml
+++ b/.github/workflows/test_referencetests.yml
@@ -47,7 +47,7 @@ jobs:
key: ${{ runner.os }}-m2-${{ hashFiles('**/dependency-versions.gradle') }}
restore-keys: ${{ runner.os }}-m2
- name: gradle evm:referenceTest
- run: ./gradlew evm:referenceTest
+ run: gradle evm:referenceTest
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
diff --git a/build.gradle b/build.gradle
index 2f57b476..dab4d8dd 100644
--- a/build.gradle
+++ b/build.gradle
@@ -76,7 +76,7 @@ gradle.startParameter.taskNames.each {
gradle.startParameter.taskNames = expandedTaskList.flatten()
ext {
- gradleVersion = '7.5'
+ gradleVersion = '7.6'
}
apply from: "${rootDir}/gradle/wrapper.gradle"
diff --git a/gradle/build.Dockerfile b/gradle/build.Dockerfile
index 57902dfb..8791ce15 100644
--- a/gradle/build.Dockerfile
+++ b/gradle/build.Dockerfile
@@ -51,8 +51,8 @@ RUN apt-get update \
&& which hg \
&& which svn
-ENV GRADLE_VERSION 7.3
-ARG GRADLE_DOWNLOAD_SHA256=de8f52ad49bdc759164f72439a3bf56ddb1589c4cde802d3cec7d6ad0e0ee410
+ENV GRADLE_VERSION 7.6
+ARG GRADLE_DOWNLOAD_SHA256=7ba68c54029790ab444b39d7e293d3236b2632631fb5f2e012bb28b4ff669e4b
RUN set -o errexit -o nounset \
&& echo "Downloading Gradle" \
&& wget --no-verbose --output-document=gradle.zip "https://services.gradle.org/distributions/gradle-${GRADLE_VERSION}-bin.zip" \
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2ec77e51..f42e62f3 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-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@tuweni.apache.org
For additional commands, e-mail: commits-help@tuweni.apache.org