Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrading Gradle to 8.10.1 and target Java 21 #14

Closed
wants to merge 19 commits into from
Closed

Upgrading Gradle to 8.10.1 and target Java 21 #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
dc54931
A quick go at upgrading Gradle to 8.10.1 and to compile to Java 21. N…
david-ry4n Oct 23, 2024
04b5c3e
Update github to use Java 21
david-ry4n Oct 23, 2024
7e0d078
Update github to use Gradle 8.10.1
david-ry4n Oct 23, 2024
a964a58
Fix Docker build file.
david-ry4n Oct 23, 2024
f120c53
Switch docker build image to consensys/tuweni-build
david-ry4n Oct 23, 2024
fe353bc
update build and push docker image.
david-ry4n Oct 25, 2024
244b09c
Fix build error
david-ry4n Oct 25, 2024
37c8514
Updating buildDir to layout.buildDirectory. Update Checksums task and…
david-ry4n Oct 27, 2024
88fa253
working with file() and native Gradle capabilities.
david-ry4n Oct 28, 2024
5077cca
more progress
david-ry4n Oct 28, 2024
f9fa289
back to working method.
david-ry4n Oct 28, 2024
a9f9d22
spotless
david-ry4n Oct 28, 2024
e72f0b4
create the files.
david-ry4n Oct 28, 2024
d62e8c9
try mkdir
david-ry4n Oct 28, 2024
980f43c
more improvements
david-ry4n Oct 28, 2024
ce3ce7f
more baby steps.
david-ry4n Oct 28, 2024
a6530fb
adding more dependsOn
david-ry4n Oct 28, 2024
723acec
fixing more dependsOn
david-ry4n Oct 28, 2024
a0e0406
update actions versions.
david-ry4n Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,35 +28,35 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up GPG key
run: gpg --import gradle/tuweni-test.asc
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: gradle assemble
run: gradle assemble compileTestJava compileIntegrationTestJava -x test -Psignatory.keyId=90010D4396A46BAF -Psigning.gnupg.keyName=90010D4396A46BAF -Psigning.gnupg.executable=gpg
env:
ENABLE_SIGNING: true
- name: Upload source distrib
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: distsrc
path: dist/build/distributions/tuweni-src-*.zip
- name: Upload binary distrib
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: snapshot.zip
path: dist/build/distributions/tuweni-bin-*.zip
- name: Cache classes
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/*.class"
key: ${{ runner.os }}-build-${{ github.sha }}
Expand All @@ -65,27 +65,27 @@ jobs:
runs-on: ubuntu-latest
needs: assemble
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: Cache classes
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/*.class"
key: ${{ runner.os }}-build-${{ github.sha }}
- name: gradle test
run: gradle test
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: junit-report
path: '**/build/reports/tests/**'
Expand All @@ -98,7 +98,7 @@ jobs:
needs: assemble
steps:
- name: Download distsrc
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
id: download
with:
name: distsrc
Expand All @@ -110,10 +110,10 @@ jobs:
run: Expand-Archive -Force -Path tuweni-src-*.zip -DestinationPath distunzipped
- name: Rename folder
run: mv distunzipped/tuweni-src-* distunzipped/tuweni
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: 17
java-version: 21
distribution: temurin
cache: gradle
- name: Build from source
Expand All @@ -127,27 +127,27 @@ jobs:
runs-on: ubuntu-latest
needs: assemble
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 17
- name: Set up JDK 21
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: Cache classes
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/*.class"
key: ${{ runner.os }}-build-${{ github.sha }}
- name: gradle integrationTest
run: gradle compileJava compileKotlin compileIntegrationTestJava compileIntegrationTestKotlin devp2p-eth:integrationTest devp2p-proxy:integrationTest devp2p:integrationTest dist:integrationTest dns-discovery:integrationTest eth-client-ui:integrationTest eth-client:integrationTest ethstats:integrationTest gossip:integrationTest hobbits-relayer:integrationTest hobbits:integrationTest plumtree-servlet:integrationTest plumtree-vertx:integrationTest rlpx:integrationTest
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: junit-report
path: '**/build/reports/tests/**'
Expand All @@ -157,19 +157,19 @@ jobs:
needs: assemble
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: Cache classes
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/*.class"
key: ${{ runner.os }}-build-${{ github.sha }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: gradle spotlessCheck checkNotice
run: gradle spotlessCheck checkNotice
2 changes: 1 addition & 1 deletion .github/workflows/license-checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
timeout-minutes: 30
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
steps:
- uses: actions/checkout@v4
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
publish:
runs-on: ubuntu-latest
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
permissions:
contents: read
packages: write
Expand All @@ -34,7 +34,7 @@ jobs:
submodules: true
- uses: actions/setup-java@v4
with:
java-version: '17'
java-version: '21'
distribution: 'temurin'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/ssb-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,29 +46,29 @@ jobs:
ssb_port: 8008
ssb_dir: /tmp/ssb
container:
image: tmio/tuweni-build:1.2
image: consensys/tuweni-build:1.3
volumes:
- /tmp/ssb:/tmp/ssb
steps:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: Cache classes
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: "**/*.class"
key: ${{ runner.os }}-build-${{ github.sha }}
- name: gradle integrationTest
run: gradle scuttlebutt-client-lib:integrationTest scuttlebutt-discovery:integrationTest scuttlebutt-handshake:integrationTest scuttlebutt-rpc:integrationTest
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: junit-report
path: '**/build/reports/tests/**'
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-windows.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: true
- name: Set up JDK 17
uses: actions/setup-java@v3
- name: Set up JDK 21
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 17
java-version: 21
cache: gradle
- name: gradle test
run: ./gradlew.bat test
- name: Archive Junit Report
if: always()
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: junit-report
path: '**/build/reports/tests/**'
Expand Down
Loading
Loading