Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
77 changes: 61 additions & 16 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,24 @@ on:
options:
- "0"
- "1"
ProcessDumpType:
description: '.NET process dump type'
required: false
default: '3'
type: choice
options:
- "1"
- "2"
- "3"
- "4"
EnableVerboseDiagnosticProcessDump:
description: 'Enables verbose diagnostic logging of the dump process'
required: false
default: '0'
type: choice
options:
- "0"
- "1"

concurrency:
group: '${{ github.workflow }} @ ${{ github.event.pull_request.head.label || github.head_ref || github.ref }}'
Expand Down Expand Up @@ -368,25 +386,26 @@ jobs:
- 9092:9092
env:
KNET_DOCKER_RUNNING_MODE: server-standalone
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_2 }}
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_3 }}

strategy:
fail-fast: false
matrix:
os: [ 'ubuntu-latest' ] #, 'macos-latest', 'macos-13' , 'windows-latest' ] # not available services in this runners, checks done in execute_tests_other
framework: [ 'net8.0', 'net9.0' ]
jdk_vendor: [ 'temurin', 'microsoft', 'corretto', 'zulu', 'oracle']
jdk_vendor: [ 'temurin', 'microsoft', 'corretto', 'zulu', 'oracle', 'graalvm' ]
jdk_version: [ '17', '21' ] # only supported LTS versions

runs-on: ${{ matrix.os }}
env:
DOTNET_DbgEnableMiniDump: ${{ inputs.EnableProcessDump }}
DOTNET_DbgMiniDumpType: 3
DOTNET_DbgMiniDumpType: ${{ inputs.ProcessDumpType }}
DOTNET_DbgMiniDumpName: ${{ github.workspace }}/coredump.%p
DOTNET_CreateDumpDiagnostics: ${{ inputs.EnableProcessDump }}
DOTNET_CreateDumpVerboseDiagnostics: ${{ inputs.EnableProcessDump }}
DOTNET_CreateDumpVerboseDiagnostics: ${{ inputs.EnableVerboseDiagnosticProcessDump }}
DOTNET_EnableCrashReport: ${{ inputs.EnableProcessDump }}
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_2 }}
DOTNET_CreateDumpLogToFile: ${{ github.workspace }}/coredump.diagnostic
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_3 }}

steps:
- name: Restore KNet ${{ matrix.framework }} bin from cache
Expand All @@ -398,11 +417,19 @@ jobs:
key: KNet_${{ github.run_number }}_${{ github.run_attempt }}_${{ matrix.framework }}_bin_${{ github.sha }}

- name: Set up JDK distribution
if: ${{ matrix.jdk_vendor != 'graalvm' }}
uses: actions/setup-java@v5
with: # running setup-java again overwrites the settings.xml
distribution: ${{ matrix.jdk_vendor }}
java-version: ${{ matrix.jdk_version }}
check-latest: true

- name: Set up GraalVM distribution
if: ${{ matrix.jdk_vendor == 'graalvm' }}
uses: graalvm/setup-graalvm@v1
with:
java-version: '${{ matrix.jdk_version }}' # See 'Options' for more details
distribution: 'graalvm' # See 'Supported distributions' for available options
github-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-dotnet@v5
if: ${{ matrix.framework == 'net9.0' }}
Expand Down Expand Up @@ -445,18 +472,19 @@ jobs:
matrix:
os: [ 'windows-latest' ] # 'macos-13' removed waiting https://github.com/masesgroup/JNet/issues/518
framework: [ 'net462', 'net8.0', 'net9.0' ]
jdk_vendor: [ 'temurin', 'microsoft', 'corretto', 'zulu', 'oracle']
jdk_vendor: [ 'temurin', 'microsoft', 'corretto', 'zulu', 'oracle', 'graalvm' ]
jdk_version: [ '17', '21' ] # only supported LTS versions

runs-on: ${{ matrix.os }}
env:
DOTNET_DbgEnableMiniDump: ${{ inputs.EnableProcessDump }}
DOTNET_DbgMiniDumpType: 3
DOTNET_DbgMiniDumpType: ${{ inputs.ProcessDumpType }}
DOTNET_DbgMiniDumpName: ${{ github.workspace }}/coredump.%p
DOTNET_CreateDumpDiagnostics: ${{ inputs.EnableProcessDump }}
DOTNET_CreateDumpVerboseDiagnostics: ${{ inputs.EnableProcessDump }}
DOTNET_CreateDumpVerboseDiagnostics: ${{ inputs.EnableVerboseDiagnosticProcessDump }}
DOTNET_EnableCrashReport: ${{ inputs.EnableProcessDump }}
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_2 }}
DOTNET_CreateDumpLogToFile: ${{ github.workspace }}/coredump.diagnostic
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_3 }}

steps:
- name: Restore KNet ${{ matrix.framework }} bin from cache
Expand All @@ -476,11 +504,19 @@ jobs:
key: KNet_${{ github.run_number }}_${{ github.run_attempt }}_Nuget_${{ github.sha }}

- name: Set up JDK distribution
if: ${{ matrix.jdk_vendor != 'graalvm' }}
uses: actions/setup-java@v5
with: # running setup-java again overwrites the settings.xml
distribution: ${{ matrix.jdk_vendor }}
java-version: ${{ matrix.jdk_version }}
check-latest: true

- name: Set up GraalVM distribution
if: ${{ matrix.jdk_vendor == 'graalvm' }}
uses: graalvm/setup-graalvm@v1
with:
java-version: '${{ matrix.jdk_version }}' # See 'Options' for more details
distribution: 'graalvm' # See 'Supported distributions' for available options
github-token: ${{ secrets.GITHUB_TOKEN }}

- name: Download Procdump and prepare # see https://gist.github.com/Sedeniono/e6d6504e3bf0645937852ee5681ef9ee and https://learn.microsoft.com/it-it/sysinternals/downloads/procdump
if: ${{ inputs.EnableProcessDump == 1 }}
Expand Down Expand Up @@ -556,18 +592,19 @@ jobs:
matrix:
os: [ 'macos-latest' ] # 'macos-13' removed waiting https://github.com/masesgroup/JNet/issues/518
framework: [ 'net8.0', 'net9.0' ]
jdk_vendor: [ 'temurin', 'microsoft', 'corretto', 'zulu', 'oracle']
jdk_vendor: [ 'temurin', 'microsoft', 'corretto', 'zulu', 'oracle', 'graalvm' ]
jdk_version: [ '17', '21' ] # only supported LTS versions

runs-on: ${{ matrix.os }}
env:
DOTNET_DbgEnableMiniDump: ${{ inputs.EnableProcessDump }}
DOTNET_DbgMiniDumpType: 3
DOTNET_DbgMiniDumpType: ${{ inputs.ProcessDumpType }}
DOTNET_DbgMiniDumpName: ${{ github.workspace }}/coredump.%p
DOTNET_CreateDumpDiagnostics: ${{ inputs.EnableProcessDump }}
DOTNET_CreateDumpVerboseDiagnostics: ${{ inputs.EnableProcessDump }}
DOTNET_CreateDumpVerboseDiagnostics: ${{ inputs.EnableVerboseDiagnosticProcessDump }}
DOTNET_EnableCrashReport: ${{ inputs.EnableProcessDump }}
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_2 }}
DOTNET_CreateDumpLogToFile: ${{ github.workspace }}/coredump.diagnostic
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_3 }}

steps:
- name: Restore KNet ${{ matrix.framework }} bin from cache
Expand All @@ -587,11 +624,19 @@ jobs:
key: KNet_${{ github.run_number }}_${{ github.run_attempt }}_Nuget_${{ github.sha }}

- name: Set up JDK distribution
if: ${{ matrix.jdk_vendor != 'graalvm' }}
uses: actions/setup-java@v5
with: # running setup-java again overwrites the settings.xml
distribution: ${{ matrix.jdk_vendor }}
java-version: ${{ matrix.jdk_version }}
check-latest: true

- name: Set up GraalVM distribution
if: ${{ matrix.jdk_vendor == 'graalvm' }}
uses: graalvm/setup-graalvm@v1
with:
java-version: '${{ matrix.jdk_version }}' # See 'Options' for more details
distribution: 'graalvm' # See 'Supported distributions' for available options
github-token: ${{ secrets.GITHUB_TOKEN }}

- uses: actions/setup-dotnet@v5
if: ${{ matrix.os == 'macos-latest' && matrix.framework == 'net9.0' }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/generateclasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ jobs:
DOTNET_CreateDumpDiagnostics: 1
DOTNET_CreateDumpVerboseDiagnostics: 1
DOTNET_EnableCrashReport: 1
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_2 }}
JNet_Version: 2.6.2
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_3 }}
JNet_Version: 2.6.3

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
2 changes: 1 addition & 1 deletion src/jvm/knet/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<maven.compiler.target>17</maven.compiler.target>
<classpathfile>${basedir}/classpathfile.classpath</classpathfile>
<mavenSkipMain>false</mavenSkipMain> <!-- set mavenSkipMain to true to avoid source compilation: use directive in command-line -->
<jnetVersion>2.6.2.0</jnetVersion>
<jnetVersion>2.6.3.0</jnetVersion>
<kafkaVersion>4.0.0</kafkaVersion>
<knetVersion>3.0.3.0</knetVersion>
<rootDir>${basedir}/../../../</rootDir>
Expand Down
2 changes: 1 addition & 1 deletion src/net/KNet/KNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
<None Include="..\..\documentation\articles\usage.md" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="MASES.JNet" Version="2.6.2">
<PackageReference Include="MASES.JNet" Version="2.6.3">
<IncludeAssets>All</IncludeAssets>
<PrivateAssets>None</PrivateAssets>
</PackageReference>
Expand Down
Loading