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
17 changes: 9 additions & 8 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@ on:
required: false
default: false
type: boolean
ExecuteOnLargerJDKSet:
description: 'Executes tests on more JDK'
ExecuteOnLargerJDKVendorSet:
description: 'Executes tests on more JDK vendor'
required: false
default: false
type: boolean
EnableLinuxTests:
description: 'Enable tests in Linux'
ExecuteOnLargerJDKVersionSet:
description: 'Executes tests on more JDK version'
required: false
default: false
type: boolean
Expand Down Expand Up @@ -149,15 +149,16 @@ jobs:
uses: ./.github/workflows/build_common.yaml
with:
ExecuteOnMoreOSes: ${{ inputs.ExecuteOnMoreOSes || github.event_name == 'schedule' }}
ExecuteOnLargerJDKSet: ${{ inputs.ExecuteOnLargerJDKSet || github.ref_name == 'master' || github.event_name == 'schedule' }}
ExecuteOnLargerJDKVendorSet: ${{ inputs.ExecuteOnLargerJDKVendorSet || github.ref_name == 'master' || github.event_name == 'schedule' }}
ExecuteOnLargerJDKVersionSet: ${{ inputs.ExecuteOnLargerJDKVersionSet || github.ref_name == 'master' || github.event_name == 'schedule' }}
EnableLinuxTests: true
EnableWindowsTests: ${{ inputs.ExecuteOnWindows || github.ref_name == 'master' || github.event_name == 'schedule' }}
EnableMacOSTests: ${{ inputs.ExecuteOnMacOS || github.event_name == 'schedule' }}
EnableWindowsTests: ${{ inputs.EnableWindowsTests || github.ref_name == 'master' || github.event_name == 'schedule' }}
EnableMacOSTests: ${{ inputs.EnableMacOSTests || github.event_name == 'schedule' }}
ForceContinueOnError: ${{ inputs.ForceContinueOnError || false }}
EnableProcessDump: ${{ inputs.EnableProcessDump || '0' }}
ProcessDumpType: ${{ inputs.ProcessDumpType || '3' }}
EnableVerboseDiagnosticProcessDump: ${{ inputs.EnableVerboseDiagnosticProcessDump || '0' }}
secrets:
actor: ${{ github.actor }}
GITHUB_TOKEN_INHERITED: ${{ secrets.GITHUB_TOKEN }}
JCOBRIDGE_ENCODED: ${{ secrets.JCOBRIDGE_ENCODED_2_6_6 }}
JCOBRIDGE_ENCODED: ${{ secrets.JCOBRIDGE_ENCODED_2_6_7 }}
25 changes: 17 additions & 8 deletions .github/workflows/build_common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,13 @@ on:
required: false
default: false
type: boolean
ExecuteOnLargerJDKSet:
description: 'Executes tests on more JDK'
ExecuteOnLargerJDKVendorSet:
description: 'Executes tests on more JDK vendor'
required: false
default: false
type: boolean
ExecuteOnLargerJDKVersionSet:
description: 'Executes tests on more JDK version'
required: false
default: false
type: boolean
Expand Down Expand Up @@ -293,17 +298,17 @@ jobs:
matrix_mac_os: ${{ steps.set-matrix-mac-os.outputs.matrix_mac || steps.set-matrix-mac-os-ext.outputs.matrix_mac }}
steps:
- id: set-jdk-vendor
if: ${{ inputs.ExecuteOnLargerJDKSet == false }}
if: ${{ inputs.ExecuteOnLargerJDKVendorSet == false }}
run: echo "matrix_jdk_vendor=[ 'temurin' ]" >> $GITHUB_OUTPUT
- id: set-jdk-vendor-ext
if: ${{ inputs.ExecuteOnLargerJDKSet == true }}
if: ${{ inputs.ExecuteOnLargerJDKVendorSet == true }}
run: echo "matrix_jdk_vendor=[ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle' ]" >> $GITHUB_OUTPUT
- id: set-jdk-version
if: ${{ inputs.ExecuteOnMoreOSes == false }}
run: echo "matrix_jdk_version=[ '8', '11', '17', '21', '25' ]" >> $GITHUB_OUTPUT
- id: set-jdk-version-ext
if: ${{ inputs.ExecuteOnMoreOSes == true }}
if: ${{ inputs.ExecuteOnLargerJDKVersionSet == false }}
run: echo "matrix_jdk_version=[ '17', '21', '25' ]" >> $GITHUB_OUTPUT
- id: set-jdk-version
if: ${{ inputs.ExecuteOnLargerJDKVersionSet == true }}
run: echo "matrix_jdk_version=[ '8', '11', '17', '21', '25' ]" >> $GITHUB_OUTPUT
- id: set-matrix-win-os
if: ${{ inputs.ExecuteOnMoreOSes == false }}
run: echo "matrix_win=[ 'windows-2025' ]" >> $GITHUB_OUTPUT
Expand Down Expand Up @@ -334,6 +339,10 @@ jobs:
jdk_vendor: ${{ fromJSON(needs.prepare_matrix_data.outputs.matrix_jdk_vendor) }}
jdk_version: ${{ fromJSON(needs.prepare_matrix_data.outputs.matrix_jdk_version) }} # only LTS versions
exclude:
- os: windows-11-arm
framework: net462
- os: windows-11-arm
jdk_version: 17
- jdk_vendor: microsoft
jdk_version: 8
- jdk_vendor: oracle
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/generateclasses.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
DOTNET_CreateDumpDiagnostics: 1
DOTNET_CreateDumpVerboseDiagnostics: 1
DOTNET_EnableCrashReport: 1
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_6 }}
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ENCODED_2_6_7 }}

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
Expand Down
4 changes: 4 additions & 0 deletions src/net/JNet/Developed/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[*.cs]
generated_code = true
dotnet_analyzer_diagnostic.severity = none
dotnet_diagnostic.CS0108.severity = none
2 changes: 1 addition & 1 deletion src/net/JNet/JNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
<PackageReference Include="MASES.JCOBridge" Version="2.6.6">
<PackageReference Include="MASES.JCOBridge" Version="2.6.7-beta6">
<IncludeAssets>All</IncludeAssets>
<PrivateAssets>None</PrivateAssets>
</PackageReference>
Expand Down
2 changes: 1 addition & 1 deletion src/net/JNet/Specific/AsyncEnumerable.cs
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public ValueTask<bool> MoveNextAsync()
/// <typeparam name="TClass">The class implementing <see cref="IJVMBridgeBase"/></typeparam>
/// <typeparam name="TObject">The type of objects to enumerate implementing <see cref="IJVMBridgeBase"/></typeparam>
public abstract class JNetAsyncEnumerable<TClass, TObject> : JVMBridgeBaseEnumerable<TClass, TObject>, IAsyncEnumerable<TObject>
where TClass : JVMBridgeBase
where TClass : class, IJVMBridgeBase
{
/// <summary>
/// Create an instance of <see cref="JNetAsyncEnumerable{TClass, TObject}"/>
Expand Down
2 changes: 1 addition & 1 deletion src/net/JNetReflector/JNetReflector.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="MASES.CLIParser" Version="3.2.1" />
<PackageReference Include="MASES.JCOBridge" Version="2.6.6">
<PackageReference Include="MASES.JCOBridge" Version="2.6.7-beta6">
<IncludeAssets>All</IncludeAssets>
<PrivateAssets>None</PrivateAssets>
</PackageReference>
Expand Down
Loading