diff --git a/.github/workflows/linux.yaml b/.github/workflows/linux.yaml index 9e91c5500a..aa8dac40f8 100644 --- a/.github/workflows/linux.yaml +++ b/.github/workflows/linux.yaml @@ -223,7 +223,12 @@ jobs: sudo apt-get install zip curl -s "https://get.sdkman.io" | bash source "$HOME/.sdkman/bin/sdkman-init.sh" - sdk install scala 2.13.5 + sdk install scala 2.13.13 + + - 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: | diff --git a/.github/workflows/windows.yaml b/.github/workflows/windows.yaml index a27696899c..04b8fafe41 100644 --- a/.github/workflows/windows.yaml +++ b/.github/workflows/windows.yaml @@ -123,10 +123,10 @@ jobs: shell: cmd - name: Download Scala package - run: C:\msys64\usr\bin\wget.exe https://downloads.lightbend.com/scala/2.13.5/scala-2.13.5.zip + run: C:\msys64\usr\bin\wget.exe https://downloads.lightbend.com/scala/2.13.13/scala-2.13.13.zip - name: Expand Scala package - run: Expand-Archive -LiteralPath '.\scala-2.13.5.zip' -DestinationPath .\bin\ -Force + run: Expand-Archive -LiteralPath '.\scala-2.13.13.zip' -DestinationPath .\bin\ -Force - name: Save JCOReflector source in cache uses: actions/cache/save@v4 @@ -281,68 +281,73 @@ jobs: java-version: ${{ matrix.jdk_version }} cache: 'maven' + - 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 for ${{ matrix.framework }} shell: cmd run: | cd ./tests/jvm/scala mkdir output - ..\..\..\bin\scala-2.13.5\bin\scalac -toolcp "../../../bin/${{ matrix.framework }}/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/* + ..\..\..\bin\scala-2.13.13\bin\scalac -toolcp "../../../bin/${{ matrix.framework }}/*" -d ./output ./src/main/scala/hierarchy/* ./src/main/scala/mscorlib/* ./src/main/scala/nettest/* ./src/main/scala/refout/* - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloLock ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloLock ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloNet ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloNETEvent ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" mscorlib.HelloIterator ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" hierarchy.HelloHierarchy ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" hierarchy.HelloInterfaces ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" nettest.HelloNETSocket ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" nettest.HelloNETSocket -async ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" refout.HelloRefOutBase ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: JCOBRIDGE_SCOPEDON: JCOReflector|1.0.0 JCOBRIDGE_LicensePath: ${{ secrets.JCOBRIDGE_ONLINE }} - - run: .\bin\scala-2.13.5\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }} + - run: .\bin\scala-2.13.13\bin\scala -toolcp "./bin/${{ matrix.framework }}/*;./tests/jvm/scala/output" refout.HelloRefOut ${{ env.EXTRA_ARGUMENT }} shell: cmd continue-on-error: true env: