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

Jump to bottom

adds support for multi-release-jar | rework Traces #3523

Merged
merged 6 commits into from
Jul 5, 2023
Merged

adds support for multi-release-jar | rework Traces #3523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1db7dce
adds support for multi-release-jar | rework `Traces.java`
Jun 30, 2023
8187bbf
applies suggestions
Jul 4, 2023
90c4ed7
fixes identity
Jul 4, 2023
004ae4e
fixes base_ref check
Jul 5, 2023
ac3ac0a
fixes wording
Jul 5, 2023
813423f
fixes wording
Jul 5, 2023
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
13 changes: 13 additions & 0 deletions .github/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/bash
set -ex

###########################################################
# JAVA
###########################################################

mkdir -p /opt/openjdk
pushd /opt/openjdk > /dev/null
JDK_URL="https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz"
mkdir java9
pushd java9 > /dev/null
curl -L ${JDK_URL} --output OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
82 changes: 77 additions & 5 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,25 @@ jobs:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
with:
fetch-depth: 0 #needed by spotless
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.base_ref == 'main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down Expand Up @@ -45,7 +63,25 @@ jobs:
needs: preliminary
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.base_ref == 'main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -59,7 +95,25 @@ jobs:
needs: preliminary
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.base_ref == 'main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -73,11 +127,29 @@ jobs:
needs: preliminary
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.base_ref == 'main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.base_ref == 'main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
- uses: gradle/gradle-build-action@3fbe033aaae657f011f88f29be9e65ed26bd29ef # tag=v2
name: other tests
with:
arguments: check -x :reactor-core:test -x spotlessCheck --no-daemon
arguments: check -x :reactor-core:test -x :reactor-core:java9Test -x :reactor-core:java21Test -x spotlessCheck --no-daemon
98 changes: 93 additions & 5 deletions .github/workflows/publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,24 @@ jobs:
fullVersion: ${{ steps.version.outputs.fullVersion }}
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- name: setup java
- name: Download JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
Expand All @@ -42,7 +59,24 @@ jobs:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- name: setup java
- name: Download JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
Expand All @@ -62,7 +96,25 @@ jobs:
environment: snapshots
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -82,7 +134,25 @@ jobs:
environment: releases
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand All @@ -104,7 +174,25 @@ jobs:
environment: releases
steps:
- uses: actions/checkout@93ea575cb5d8a053eaa0ac8fa3b40d7e05a33cc8 # tag=v3
- uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
- name: Download JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
run: ${GITHUB_WORKSPACE}/.github/setup.sh
shell: bash
- name: Setup JDK 9
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'jdkfile'
java-version: 9.0.4
jdkFile: /opt/openjdk/java9/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
- name: Setup JDK 21
if: ${{ github.ref == 'refs/heads/main' }}
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 21-ea
- name: Setup JDK 8
uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # tag=v3
with:
distribution: 'temurin'
java-version: 8
Expand Down
3 changes: 3 additions & 0 deletions .sdkmanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Enable auto-env through the sdkman_auto_env config
# Add key=value pairs of SDKs to use below
java=8.0.372-librca
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't we need the other JDKs here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was following spring-framework setup. not sure we can specify more than one

3 changes: 3 additions & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,14 @@ plugins {
alias(libs.plugins.nohttp)
alias(libs.plugins.jcstress) apply false
alias(libs.plugins.spotless)
alias(libs.plugins.mrjar) apply false
}

apply plugin: "io.reactor.gradle.detect-ci"
apply from: "gradle/asciidoc.gradle" // asciidoc (which is generated from root dir)
apply from: "gradle/releaser.gradle"
apply from: "gradle/dependencies.gradle"
apply from: "gradle/toolchains.gradle"

repositories { //needed at root for asciidoctor and nohttp-checkstyle
mavenCentral()
Expand Down Expand Up @@ -141,6 +143,7 @@ configure(subprojects) { p ->
apply plugin: 'java'
apply plugin: 'jacoco'
apply from: "${rootDir}/gradle/setup.gradle"
apply from: "${rootDir}/gradle/toolchains.gradle"

description = 'Non-Blocking Reactive Foundation for the JVM'
group = 'io.projectreactor'
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ jcstress = { id = "io.github.reyerizo.gradle.jcstress", version = "0.8.15" }
nohttp = { id = "io.spring.nohttp", version = "0.0.11" }
shadow = { id = "com.github.johnrengelman.shadow", version = "8.1.1" }
spotless = { id = "com.diffplug.spotless", version = "6.13.0" }

mrjar = { id = "me.champeau.mrjar", version = "0.1.1" }
Loading
Loading