From b7a7630782a39ac15c062fc8d8d3f883071b6d11 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:35:03 +0200
Subject: [PATCH 01/18] Update to JCOBridge 2.5.15, update version and added
tests on MacOS
---
.github/workflows/maven.yaml | 2 +-
.github/workflows/reflect_test_commit.yaml | 12 +++++++-----
.github/workflows/release.yaml | 2 +-
src/net/CLI/JCOReflectorCLI.csproj | 2 +-
src/net/CLI/JCOReflectorCLI.nuspec | 2 +-
src/net/GUI/JCOReflectorGUI.csproj | 2 +-
src/net/engine/JCOReflectorEngine.csproj | 4 ++--
7 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 0653c968cd..4622a8deaa 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -109,7 +109,7 @@ jobs:
- name: Install local file to be used within Javadoc section of generated POM
shell: bash
- run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.14 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
+ run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.15 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
- name: Publish ${{ matrix.framework }} to Apache Maven Central
shell: bash
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 9799112c84..5cdbd634f0 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -408,11 +408,12 @@ jobs:
shell: cmd
continue-on-error: true
- execute_java_tests_linux:
+ execute_java_tests_unix:
needs: build_linux
strategy:
fail-fast: false
matrix:
+ os: [ 'ubuntu-latest', 'macos-latest', 'macos-latest-large' ]
framework: [ 'net6.0', 'net8.0' ]
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
@@ -420,7 +421,7 @@ jobs:
- jdk_vendor: oracle
jdk_version: 11
- runs-on: ubuntu-latest
+ runs-on: ${{ matrix.os }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
@@ -494,11 +495,12 @@ jobs:
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOutBase
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOut
- execute_scala_tests_linux:
+ execute_scala_tests_unix:
needs: build_linux
strategy:
fail-fast: false
matrix:
+ os: [ 'ubuntu-latest', 'macos-latest', 'macos-latest-large' ]
framework: [ 'net6.0', 'net8.0' ]
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
@@ -506,7 +508,7 @@ jobs:
- jdk_vendor: oracle
jdk_version: 11
- runs-on: ubuntu-latest
+ runs-on: ${{ matrix.os }}
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
@@ -601,7 +603,7 @@ jobs:
- run: rm -rf ./tests/jvm/scala/output
execute_finalize:
- needs: [execute_java_tests_windows, execute_scala_tests_windows, execute_java_tests_linux, execute_scala_tests_linux]
+ needs: [execute_java_tests_windows, execute_scala_tests_windows, execute_java_tests_unix, execute_scala_tests_unix]
runs-on: windows-latest
steps:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 5c9f57cbce..0c4bfab22f 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,7 +58,7 @@ jobs:
- name: Install local file to be used within Javadoc section of generated POM
shell: bash
- run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.14 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
+ run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.15 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
- name: Publish ${{ matrix.framework }} to Apache Maven Central
shell: bash
diff --git a/src/net/CLI/JCOReflectorCLI.csproj b/src/net/CLI/JCOReflectorCLI.csproj
index e2dabebe7f..92ecc39fd6 100644
--- a/src/net/CLI/JCOReflectorCLI.csproj
+++ b/src/net/CLI/JCOReflectorCLI.csproj
@@ -9,7 +9,7 @@
Copyright © MASES s.r.l. 2024
MASES s.r.l.
MASES s.r.l.
- 1.14.2.0
+ 1.14.3.0
MASES.JCOReflectorCLI
true
net462;net6.0;net8.0
diff --git a/src/net/CLI/JCOReflectorCLI.nuspec b/src/net/CLI/JCOReflectorCLI.nuspec
index 5bd0fd3d21..9fec9f2af8 100644
--- a/src/net/CLI/JCOReflectorCLI.nuspec
+++ b/src/net/CLI/JCOReflectorCLI.nuspec
@@ -2,7 +2,7 @@
MASES.JCOReflectorCLI
- 1.14.2
+ 1.14.3
JCOReflector CLI - CLI interface for JCOReflector Engine
MASES s.r.l.
MASES s.r.l.
diff --git a/src/net/GUI/JCOReflectorGUI.csproj b/src/net/GUI/JCOReflectorGUI.csproj
index 877dbfd7c2..1c2715cc2d 100644
--- a/src/net/GUI/JCOReflectorGUI.csproj
+++ b/src/net/GUI/JCOReflectorGUI.csproj
@@ -8,7 +8,7 @@
Copyright © MASES s.r.l. 2024
MASES s.r.l.
MASES s.r.l.
- 1.14.2.0
+ 1.14.3.0
JCOReflectorGUI
true
net462;net6.0-windows;net8.0-windows
diff --git a/src/net/engine/JCOReflectorEngine.csproj b/src/net/engine/JCOReflectorEngine.csproj
index eb378478a5..bd9f520dbb 100644
--- a/src/net/engine/JCOReflectorEngine.csproj
+++ b/src/net/engine/JCOReflectorEngine.csproj
@@ -7,7 +7,7 @@
Copyright © MASES s.r.l. 2024
MASES s.r.l.
MASES s.r.l.
- 1.14.2.0
+ 1.14.3.0
MASES.JCOReflectorEngine
true
net462;net6.0;net8.0
@@ -115,7 +115,7 @@
-
+
All
None
From e7033e378ede6bc8004b66f0c80fc7eeb4490d30 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:40:21 +0200
Subject: [PATCH 02/18] Package preparation update
---
src/net/engine/Const.cs | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/src/net/engine/Const.cs b/src/net/engine/Const.cs
index 64a1e5ae2a..c44baace0a 100644
--- a/src/net/engine/Const.cs
+++ b/src/net/engine/Const.cs
@@ -180,6 +180,10 @@ public static string GetRelativePath(string filespec, string folder)
Path.Combine("linux-arm64", "libnethost.so"),
Path.Combine("linux-x64", "J2CBridgeHostActivator.so"),
Path.Combine("linux-x64", "libnethost.so"),
+ Path.Combine("osx-arm64", "J2CBridgeHostActivator.dylib"),
+ Path.Combine("osx-arm64", "libnethost.dylib"),
+ Path.Combine("osx-x64", "J2CBridgeHostActivator.dylib"),
+ Path.Combine("osx-x64", "libnethost.dylib"),
#if !NET8_0
Path.Combine("win-arm", "J2CBridgeHostActivator.dll"),
Path.Combine("win-arm", "nethost.dll"),
@@ -198,8 +202,10 @@ public static string GetRelativePath(string filespec, string folder)
"J2CBridge_Arm.so",
"J2CBridge_Arm64.dll",
"J2CBridge_Arm64.so",
+ "J2CBridge_Arm64.dylib",
"J2CBridge_x64.dll",
"J2CBridge_x64.so",
+ "J2CBridge_x64.dylib",
"J2CBridge_x86.dll",
"JCOBridge.docs.jar",
"JCOBridge.jar",
From 008274d0f41d6c6be8e118b9f319ee5627ac48ec Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 19:47:27 +0200
Subject: [PATCH 03/18] Update MacOS image
---
.github/workflows/reflect_test_commit.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 5cdbd634f0..0095986e96 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -413,7 +413,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ 'ubuntu-latest', 'macos-latest', 'macos-latest-large' ]
+ os: [ 'ubuntu-latest', 'macos-latest', 'macos-13' ]
framework: [ 'net6.0', 'net8.0' ]
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
@@ -500,7 +500,7 @@ jobs:
strategy:
fail-fast: false
matrix:
- os: [ 'ubuntu-latest', 'macos-latest', 'macos-latest-large' ]
+ os: [ 'ubuntu-latest', 'macos-latest', 'macos-13' ]
framework: [ 'net6.0', 'net8.0' ]
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
From 204a5c0c5c9403a6cc8d824724dba333aed105e3 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 23:09:58 +0200
Subject: [PATCH 04/18] Test
---
.github/workflows/reflect_test_commit.yaml | 46 +++++++++++++---------
1 file changed, 27 insertions(+), 19 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 0095986e96..42690f65a7 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -6,12 +6,14 @@ name: CI_REFLECT_TEST_COMMIT
# events but only for the master branch
on:
push:
- branches: [ master ]
+ # only trigger on branches, not on tags
+ branches: '**'
# This workflow contains two jobs called "check" and "build_windows"
jobs:
# Verify if a build is needed
check:
+ if: ${{ github.repository_owner == 'masesgroup' || ( github.repository_owner != 'masesgroup' && $GITHUB_REF_NAME != 'master' }} #do not execute on master outside main repo
name: Check changed files
outputs:
run_job: ${{ steps.check_files.outputs.run_job }}
@@ -443,6 +445,9 @@ jobs:
java-version: ${{ matrix.jdk_version }}
cache: 'maven'
+ - name: Extract secret
+ run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} $GITHUB_WORKSPACE/JCOBridge.lic
+
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
shell: bash
@@ -455,42 +460,42 @@ jobs:
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" mscorlib.HelloNET ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" nettest.HelloNETSocket -server 127.0.0.1 ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" nettest.HelloNETSocket -async -server 127.0.0.1 ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOutBase
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOut
@@ -539,6 +544,9 @@ jobs:
source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk install scala 2.13.13
+ - name: Extract secret
+ run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} $GITHUB_WORKSPACE/JCOBridge.lic
+
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
shell: bash
@@ -554,52 +562,52 @@ jobs:
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: rm -rf ./tests/jvm/scala/output
execute_finalize:
From 4896240e5839e96d6d18b9e87621f94bd4469b2c Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 23:14:08 +0200
Subject: [PATCH 05/18] Update
---
.github/workflows/reflect_test_commit.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 42690f65a7..3cc5c8e980 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -13,7 +13,7 @@ on:
jobs:
# Verify if a build is needed
check:
- if: ${{ github.repository_owner == 'masesgroup' || ( github.repository_owner != 'masesgroup' && $GITHUB_REF_NAME != 'master' }} #do not execute on master outside main repo
+ if: ${{ github.repository_owner == 'masesgroup' || ( github.repository_owner != 'masesgroup' && github.ref_name != 'master' }} #do not execute on master outside main repo
name: Check changed files
outputs:
run_job: ${{ steps.check_files.outputs.run_job }}
From cb2f29b2c8b420e514a1d280379e6f4966737153 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 23:15:27 +0200
Subject: [PATCH 06/18] Update
---
.github/workflows/reflect_test_commit.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 3cc5c8e980..538ed2f7bd 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -13,7 +13,7 @@ on:
jobs:
# Verify if a build is needed
check:
- if: ${{ github.repository_owner == 'masesgroup' || ( github.repository_owner != 'masesgroup' && github.ref_name != 'master' }} #do not execute on master outside main repo
+ if: ${{ github.repository_owner == 'masesgroup' || (github.repository_owner != 'masesgroup' && github.ref_name != 'master') }} #do not execute on master outside main repo
name: Check changed files
outputs:
run_job: ${{ steps.check_files.outputs.run_job }}
From 1bc1d0f160c4c91e394886a8dc203cc0d6d206ed Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 23:20:36 +0200
Subject: [PATCH 07/18] Review
---
.github/workflows/reflect_test_commit.yaml | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 538ed2f7bd..8f7760fdec 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -446,7 +446,8 @@ jobs:
cache: 'maven'
- name: Extract secret
- run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} $GITHUB_WORKSPACE/JCOBridge.lic
+ shell: pwsh
+ run: ${{ github.workspace }}/.github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}/JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
@@ -545,7 +546,8 @@ jobs:
sdk install scala 2.13.13
- name: Extract secret
- run: .github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} $GITHUB_WORKSPACE/JCOBridge.lic
+ shell: pwsh
+ run: ${{ github.workspace }}/.github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}/JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
From fc6f58de3d3b129a038d859d4f1b6e0ffbd465ad Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Fri, 21 Jun 2024 23:30:47 +0200
Subject: [PATCH 08/18] Path fix
---
.github/workflows/reflect_test_commit.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 8f7760fdec..7a45a9b717 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -447,7 +447,7 @@ jobs:
- name: Extract secret
shell: pwsh
- run: ${{ github.workspace }}/.github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}/JCOBridge.lic
+ run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
@@ -547,7 +547,7 @@ jobs:
- name: Extract secret
shell: pwsh
- run: ${{ github.workspace }}/.github/workflows/GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}/JCOBridge.lic
+ run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
From 5cdb66784549237fa5168b092bb36a439133a60b Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 00:15:23 +0200
Subject: [PATCH 09/18] update
---
.github/workflows/reflect_test_commit.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 7a45a9b717..9f26af7062 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -447,7 +447,7 @@ jobs:
- name: Extract secret
shell: pwsh
- run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
+ run: .\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} .\JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
@@ -547,7 +547,7 @@ jobs:
- name: Extract secret
shell: pwsh
- run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
+ run: .\.\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} .\JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
From dc42e95e10389c75c5488e13936813d02e5b6750 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 00:20:38 +0200
Subject: [PATCH 10/18] Avoid .NET on MacOS
---
.github/workflows/reflect_test_commit.yaml | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 9f26af7062..fa6f49a0cb 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -420,6 +420,10 @@ jobs:
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
exclude:
+ - os: macos-latest
+ framework: net6.0
+ - os: macos-13
+ framework: net6.0
- jdk_vendor: oracle
jdk_version: 11
@@ -447,7 +451,7 @@ jobs:
- name: Extract secret
shell: pwsh
- run: .\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} .\JCOBridge.lic
+ run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
@@ -511,6 +515,10 @@ jobs:
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
exclude:
+ - os: macos-latest
+ framework: net6.0
+ - os: macos-13
+ framework: net6.0
- jdk_vendor: oracle
jdk_version: 11
@@ -547,7 +555,7 @@ jobs:
- name: Extract secret
shell: pwsh
- run: .\.\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} .\JCOBridge.lic
+ run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
From a2a250126f7c4a3fb987abcf743d110269766a46 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 00:34:37 +0200
Subject: [PATCH 11/18] Added specific mac section
---
.github/workflows/reflect_test_commit.yaml | 115 ++++++++++++++++++++-
1 file changed, 111 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index fa6f49a0cb..edb9451079 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -505,12 +505,11 @@ jobs:
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOutBase
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOut
- execute_scala_tests_unix:
+ execute_scala_tests_linux:
needs: build_linux
strategy:
fail-fast: false
matrix:
- os: [ 'ubuntu-latest', 'macos-latest', 'macos-13' ]
framework: [ 'net6.0', 'net8.0' ]
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
@@ -522,7 +521,7 @@ jobs:
- jdk_vendor: oracle
jdk_version: 11
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v4
@@ -620,8 +619,116 @@ jobs:
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- run: rm -rf ./tests/jvm/scala/output
+ execute_scala_tests_mac:
+ needs: build_linux
+ strategy:
+ fail-fast: false
+ matrix:
+ os: [ 'macos-latest', 'macos-13' ]
+ framework: [ 'net8.0' ]
+ jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
+ jdk_version: [ '11', '17', '21' ] # only LTS versions
+ exclude:
+ - os: macos-latest
+ framework: net6.0
+ - os: macos-13
+ framework: net6.0
+ - jdk_vendor: oracle
+ jdk_version: 11
+
+ runs-on: ${{ matrix.os }}
+ steps:
+ # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+ - uses: actions/checkout@v4
+ with:
+ fetch-depth: '1'
+
+ - name: Restore JCOReflector bin from cache
+ uses: actions/cache/restore@v4
+ with:
+ fail-on-cache-miss: true
+ enableCrossOsArchive: true
+ path: ./bin/
+ key: JCOReflector_linux_bin_${{ github.sha }}
+
+ - name: Set up JDK distribution
+ uses: actions/setup-java@v4
+ with: # running setup-java again overwrites the settings.xml
+ distribution: ${{ matrix.jdk_vendor }}
+ java-version: ${{ matrix.jdk_version }}
+ cache: 'maven'
+
+ - name: Download and install Scala package
+ run: brew install scala@2.13
+
+ - name: Extract secret
+ shell: pwsh
+ run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
+
+ - name: Prepare extra argument
+ if: matrix.framework == 'net6.0'
+ shell: bash
+ run: echo "EXTRA_ARGUMENT=--CoreCLRApp:Microsoft.NET6.App" >> $GITHUB_ENV
+
+ - name: Build Scala test source file
+ run: |
+ mkdir ./tests/jvm/scala/output
+ scalac -cp "./bin/${{ matrix.framework }}/*" -d ./tests/jvm/scala/output ./tests/jvm/scala/src/main/scala/hierarchy/* ./tests/jvm/scala/src/main/scala/mscorlib/* ./tests/jvm/scala/src/main/scala/nettest/* ./tests/jvm/scala/src/main/scala/refout/*
+
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloLock ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
+ continue-on-error: true
+ env:
+ JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
+ JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ - run: rm -rf ./tests/jvm/scala/output
+
execute_finalize:
- needs: [execute_java_tests_windows, execute_scala_tests_windows, execute_java_tests_unix, execute_scala_tests_unix]
+ needs: [execute_java_tests_windows, execute_scala_tests_windows, execute_java_tests_unix, execute_scala_tests_linux, execute_scala_tests_mac]
runs-on: windows-latest
steps:
From b36339d6497585efc7ea4ec88021f3d855385c7e Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 00:35:46 +0200
Subject: [PATCH 12/18] fix
---
.github/workflows/reflect_test_commit.yaml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index edb9451079..05dcfaf23d 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -514,10 +514,6 @@ jobs:
jdk_vendor: [ 'temurin', 'zulu', 'microsoft', 'corretto', 'oracle']
jdk_version: [ '11', '17', '21' ] # only LTS versions
exclude:
- - os: macos-latest
- framework: net6.0
- - os: macos-13
- framework: net6.0
- jdk_vendor: oracle
jdk_version: 11
From 8dbb78bd04d362225ee2f8cee9e1dd15a10f99fc Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 01:11:41 +0200
Subject: [PATCH 13/18] try again scala
---
.github/workflows/reflect_test_commit.yaml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 05dcfaf23d..dd437e58d7 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -669,54 +669,54 @@ jobs:
- name: Build Scala test source file
run: |
mkdir ./tests/jvm/scala/output
- scalac -cp "./bin/${{ matrix.framework }}/*" -d ./tests/jvm/scala/output ./tests/jvm/scala/src/main/scala/hierarchy/* ./tests/jvm/scala/src/main/scala/mscorlib/* ./tests/jvm/scala/src/main/scala/nettest/* ./tests/jvm/scala/src/main/scala/refout/*
+ /usr/local/opt/scala@2.13/bin/scalac -cp "./bin/${{ matrix.framework }}/*" -d ./tests/jvm/scala/output ./tests/jvm/scala/src/main/scala/hierarchy/* ./tests/jvm/scala/src/main/scala/mscorlib/* ./tests/jvm/scala/src/main/scala/nettest/* ./tests/jvm/scala/src/main/scala/refout/*
- run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloLock ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
+ - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
From b2bf70e077f3b8c7e832de621335e9f65a887e77 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 01:16:14 +0200
Subject: [PATCH 14/18] Removed testbranch workflow
---
.github/workflows/{testbranch.yaml => testbranch.disabled_yaml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename .github/workflows/{testbranch.yaml => testbranch.disabled_yaml} (100%)
diff --git a/.github/workflows/testbranch.yaml b/.github/workflows/testbranch.disabled_yaml
similarity index 100%
rename from .github/workflows/testbranch.yaml
rename to .github/workflows/testbranch.disabled_yaml
From 24f5a7366825effd210e3c4f1793dc20865b99ca Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 02:30:15 +0200
Subject: [PATCH 15/18] Update scala home
---
.github/workflows/reflect_test_commit.yaml | 34 +++++++++++++++-------
1 file changed, 23 insertions(+), 11 deletions(-)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index dd437e58d7..1991e735ff 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -657,6 +657,18 @@ jobs:
- name: Download and install Scala package
run: brew install scala@2.13
+ - name: Export Scala root
+ if: matrix.os == 'macos-13'
+ run: |
+ echo "SCALA_BIN=/usr/local/opt/scala@2.13/bin" >> $GITHUB_ENV
+ shell: bash
+
+ - name: Export Scala root
+ if: matrix.os == 'macos-latest'
+ run: |
+ echo "SCALA_BIN=/opt/homebrew/opt/scala@2.13/bin" >> $GITHUB_ENV
+ shell: bash
+
- name: Extract secret
shell: pwsh
run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
@@ -669,54 +681,54 @@ jobs:
- name: Build Scala test source file
run: |
mkdir ./tests/jvm/scala/output
- /usr/local/opt/scala@2.13/bin/scalac -cp "./bin/${{ matrix.framework }}/*" -d ./tests/jvm/scala/output ./tests/jvm/scala/src/main/scala/hierarchy/* ./tests/jvm/scala/src/main/scala/mscorlib/* ./tests/jvm/scala/src/main/scala/nettest/* ./tests/jvm/scala/src/main/scala/refout/*
+ ${{ env.SCALA_BIN }}/scalac -cp "./bin/${{ matrix.framework }}/*" -d ./tests/jvm/scala/output ./tests/jvm/scala/src/main/scala/hierarchy/* ./tests/jvm/scala/src/main/scala/mscorlib/* ./tests/jvm/scala/src/main/scala/nettest/* ./tests/jvm/scala/src/main/scala/refout/*
- - run: scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloLock ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloLock ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
- - run: /usr/local/opt/scala@2.13/bin/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
+ - run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
From e3e34dc4f5f72a35318cc0898213309b29c7c680 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 02:58:22 +0200
Subject: [PATCH 16/18] Update to JCOBridge 2.5.16
---
.github/workflows/maven.yaml | 2 +-
.github/workflows/reflect_test_commit.yaml | 68 +++++++++-------------
.github/workflows/release.yaml | 2 +-
src/net/engine/JCOReflectorEngine.csproj | 2 +-
4 files changed, 31 insertions(+), 43 deletions(-)
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index 4622a8deaa..b872725cf2 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -109,7 +109,7 @@ jobs:
- name: Install local file to be used within Javadoc section of generated POM
shell: bash
- run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.15 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
+ run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.16 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
- name: Publish ${{ matrix.framework }} to Apache Maven Central
shell: bash
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 1991e735ff..53c9e95026 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -449,10 +449,6 @@ jobs:
java-version: ${{ matrix.jdk_version }}
cache: 'maven'
- - name: Extract secret
- shell: pwsh
- run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
-
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
shell: bash
@@ -465,42 +461,42 @@ jobs:
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" mscorlib.HelloNET ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" nettest.HelloNETSocket -server 127.0.0.1 ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: java -cp "./bin/${{ matrix.framework }}/JCOReflector.jar:./tests/jvm/java/src/" nettest.HelloNETSocket -async -server 127.0.0.1 ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOutBase
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOut
@@ -548,10 +544,6 @@ jobs:
source "$HOME/.sdkman/bin/sdkman-init.sh"
sdk install scala 2.13.13
- - name: Extract secret
- shell: pwsh
- run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
-
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
shell: bash
@@ -567,52 +559,52 @@ jobs:
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: source "$HOME/.sdkman/bin/sdkman-init.sh" && scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: rm -rf ./tests/jvm/scala/output
execute_scala_tests_mac:
@@ -669,10 +661,6 @@ jobs:
echo "SCALA_BIN=/opt/homebrew/opt/scala@2.13/bin" >> $GITHUB_ENV
shell: bash
- - name: Extract secret
- shell: pwsh
- run: ${{ github.workspace }}\.github\workflows\GetLicense.ps1 ${{ secrets.JCOBRIDGE_ENCODED_2_5_15 }} ${{ github.workspace }}\JCOBridge.lic
-
- name: Prepare extra argument
if: matrix.framework == 'net6.0'
shell: bash
@@ -687,52 +675,52 @@ jobs:
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: ${{ env.SCALA_BIN }}/scala -nobootcp -toolcp "./bin/${{ matrix.framework }}/*:./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }}
continue-on-error: true
env:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
- JCOBRIDGE_LicensePath: $GITHUB_WORKSPACE/JCOBridge.lic # ${{ secrets.JCOBRIDGE_ONLINE }}
+ JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: rm -rf ./tests/jvm/scala/output
execute_finalize:
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 0c4bfab22f..376790d3b5 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,7 +58,7 @@ jobs:
- name: Install local file to be used within Javadoc section of generated POM
shell: bash
- run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.15 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
+ run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.16 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
- name: Publish ${{ matrix.framework }} to Apache Maven Central
shell: bash
diff --git a/src/net/engine/JCOReflectorEngine.csproj b/src/net/engine/JCOReflectorEngine.csproj
index bd9f520dbb..739e31cfef 100644
--- a/src/net/engine/JCOReflectorEngine.csproj
+++ b/src/net/engine/JCOReflectorEngine.csproj
@@ -115,7 +115,7 @@
-
+
All
None
From 50d7a585dbfb77e15f1924420722518bc9ff81a4 Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 17:00:12 +0200
Subject: [PATCH 17/18] Update to JCOBridge 2.5.17
---
.github/workflows/maven.yaml | 2 +-
.github/workflows/release.yaml | 2 +-
src/net/engine/JCOReflectorEngine.csproj | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/maven.yaml b/.github/workflows/maven.yaml
index b872725cf2..75a3a7ad49 100644
--- a/.github/workflows/maven.yaml
+++ b/.github/workflows/maven.yaml
@@ -109,7 +109,7 @@ jobs:
- name: Install local file to be used within Javadoc section of generated POM
shell: bash
- run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.16 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
+ run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.17 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
- name: Publish ${{ matrix.framework }} to Apache Maven Central
shell: bash
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 376790d3b5..71176372bf 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -58,7 +58,7 @@ jobs:
- name: Install local file to be used within Javadoc section of generated POM
shell: bash
- run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.16 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
+ run: mvn install:install-file --no-transfer-progress -Dfile=../../../bin/${{ matrix.framework }}/JCOBridge.jar -DgroupId=JCOBridge -DartifactId=JCOBridge -Dversion=2.5.17 -Dpackaging=jar -f ./src/jvm/src/${{ matrix.framework }}.xml
- name: Publish ${{ matrix.framework }} to Apache Maven Central
shell: bash
diff --git a/src/net/engine/JCOReflectorEngine.csproj b/src/net/engine/JCOReflectorEngine.csproj
index 739e31cfef..4f9bdd2701 100644
--- a/src/net/engine/JCOReflectorEngine.csproj
+++ b/src/net/engine/JCOReflectorEngine.csproj
@@ -115,7 +115,7 @@
-
+
All
None
From f5619d60a640f5b196afc7f657c8485f243c000d Mon Sep 17 00:00:00 2001
From: masesdevelopers <94312179+masesdevelopers@users.noreply.github.com>
Date: Sat, 22 Jun 2024 17:45:58 +0200
Subject: [PATCH 18/18] Added error upload in tests
---
.github/workflows/reflect_test_commit.yaml | 30 ++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/.github/workflows/reflect_test_commit.yaml b/.github/workflows/reflect_test_commit.yaml
index 53c9e95026..5b3054e6d6 100644
--- a/.github/workflows/reflect_test_commit.yaml
+++ b/.github/workflows/reflect_test_commit.yaml
@@ -294,6 +294,12 @@ jobs:
JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
+ - uses: actions/upload-artifact@v4
+ with:
+ name: Errors_java_tests_windows_${{ matrix.framework }}_${{ matrix.jdk_vendor }}_${{ matrix.jdk_version }}
+ path: .\hs_err_*
+ retention-days: 1
+
execute_scala_tests_windows:
needs: build_windows
strategy:
@@ -410,6 +416,12 @@ jobs:
shell: cmd
continue-on-error: true
+ - uses: actions/upload-artifact@v4
+ with:
+ name: Errors_scala_tests_windows_${{ matrix.framework }}_${{ matrix.jdk_vendor }}_${{ matrix.jdk_version }}
+ path: .\hs_err_*
+ retention-days: 1
+
execute_java_tests_unix:
needs: build_linux
strategy:
@@ -501,6 +513,12 @@ jobs:
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOutBase
#java -cp "./bin/net6.0/JCOReflector.jar;./tests/jvm/java/src/" refout.HelloRefOut
+ - uses: actions/upload-artifact@v4
+ with:
+ name: Errors_java_tests_${{ matrix.os }}_${{ matrix.framework }}_${{ matrix.jdk_vendor }}_${{ matrix.jdk_version }}
+ path: .\hs_err_*
+ retention-days: 1
+
execute_scala_tests_linux:
needs: build_linux
strategy:
@@ -607,6 +625,12 @@ jobs:
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: rm -rf ./tests/jvm/scala/output
+ - uses: actions/upload-artifact@v4
+ with:
+ name: Errors_java_tests_linux_${{ matrix.framework }}_${{ matrix.jdk_vendor }}_${{ matrix.jdk_version }}
+ path: .\hs_err_*
+ retention-days: 1
+
execute_scala_tests_mac:
needs: build_linux
strategy:
@@ -723,6 +747,12 @@ jobs:
JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }}
- run: rm -rf ./tests/jvm/scala/output
+ - uses: actions/upload-artifact@v4
+ with:
+ name: Errors_scala_tests_${{ matrix.os }}_${{ matrix.framework }}_${{ matrix.jdk_vendor }}_${{ matrix.jdk_version }}
+ path: .\hs_err_*
+ retention-days: 1
+
execute_finalize:
needs: [execute_java_tests_windows, execute_scala_tests_windows, execute_java_tests_unix, execute_scala_tests_linux, execute_scala_tests_mac]