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.

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

W-17792569: bump cli to dw latest #96

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open
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
7 changes: 4 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@ jobs:
BUILD:
strategy:
matrix:
os: [ ubuntu-latest, windows-latest, macos-latest ]
#newer macos distributions use aarch64 arch which has no graalvm version available for java 11
os: [ ubuntu-latest, windows-latest, macos-14-arm64 ]
include:
- os: windows-latest
script_name: windows
- os: ubuntu-latest
script_name: linux
- os: macos-latest
- os: macos-14-arm64
script_name: osx
runs-on: ${{ matrix.os }}
# Steps represent a sequence of tasks that will be executed as part of the job
Expand Down Expand Up @@ -73,7 +74,7 @@ jobs:

# Upload the artifact file
- name: Upload generated script
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
with:
name: dw-${{env.NATIVE_VERSION}}-${{runner.os}}
path: native-cli/build/distributions/native-cli-${{env.NATIVE_VERSION}}-native-distro-${{ matrix.script_name }}.zip
5 changes: 3 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,14 @@ jobs:
RELEASE_EXTENSION:
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
#newer macos distributions use aarch64 arch which has no graalvm version available for java 11
os: [macos-14-arm64, ubuntu-latest, windows-latest]
include:
- os: windows-latest
script_name: windows
- os: ubuntu-latest
script_name: linux
- os: macos-latest
- os: macos-14-arm64
script_name: osx

runs-on: ${{ matrix.os }}
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
weaveVersion=2.8.0-SNAPSHOT
weaveTestSuiteVersion=2.8.0-SNAPSHOT
weaveVersion=2.10.0-SNAPSHOT
weaveTestSuiteVersion=2.10.0-SNAPSHOT
nativeVersion=100.100.100
scalaVersion=2.12.15
scalaVersion=2.12.18
ioVersion=1.0.0-SNAPSHOT
graalvmVersion=22.3.3
#Libaries
Expand Down
1 change: 1 addition & 0 deletions native-cli-integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ dependencies {

weaveSuite "org.mule.weave:runtime:${weaveTestSuiteVersion}:test@zip"
weaveSuite "org.mule.weave:yaml-module:${weaveTestSuiteVersion}:test@zip"
weaveSuite "org.mule.weave:core-modules:${weaveTestSuiteVersion}:test@zip"
testRuntimeOnly 'com.vladsch.flexmark:flexmark-all:0.62.2'
testImplementation 'commons-io:commons-io:2.11.0'
testImplementation group: 'com.sun.mail', name: 'jakarta.mail', version: '1.6.4'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,9 @@ class NativeCliRuntimeIT extends AnyFunSpec

val testSuites = Seq(
TestSuite("master", loadTestZipFile(s"weave-suites/runtime-$weaveVersion-test.zip")),
TestSuite("yaml", loadTestZipFile(s"weave-suites/yaml-module-$weaveVersion-test.zip"))
TestSuite("yaml", loadTestZipFile(s"weave-suites/yaml-module-$weaveVersion-test.zip")),
TestSuite("yaml", loadTestZipFile(s"weave-suites/core-modules-$weaveVersion-test.zip")),

)

private def loadTestZipFile(testSuiteExample: String): File = {
Expand Down Expand Up @@ -218,8 +220,8 @@ class NativeCliRuntimeIT extends AnyFunSpec

val (exitCode, _, _) = NativeCliITTestRunner(args).execute(TIMEOUT._1, TIMEOUT._2)

exitCode shouldBe 0
doAssert(outputPath.toFile, scenario.output, maybeEncoding)
exitCode shouldBe 0
}
}
}
Expand Down Expand Up @@ -374,6 +376,8 @@ class NativeCliRuntimeIT extends AnyFunSpec
"read-binary-files",
"underflow",
"try",
"try-handle-attribute-delegate-with-failures",
"try-handle-lazy-values-with-failures",
"urlEncodeDecode") ++
// Uses resource name that is different on Cli than in the Tests
Array("try-recursive-call", "runtime_orElseTry") ++
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import org.mule.weave.dwnative.utils.DataWeaveUtils
import org.mule.weave.v2.core.exception.InvalidLocationException
import org.mule.weave.v2.core.io.service.CustomWorkingDirectoryService
import org.mule.weave.v2.core.io.service.WorkingDirectoryService
import org.mule.weave.v2.interpreted.CustomRuntimeModuleNodeCompiler
import org.mule.weave.v2.interpreted.CompositeRuntimeModuleNodeCompiler
import org.mule.weave.v2.interpreted.RuntimeModuleNodeCompiler
import org.mule.weave.v2.interpreted.module.WeaveDataFormat
import org.mule.weave.v2.model.EvaluationContext
Expand Down Expand Up @@ -187,7 +187,7 @@ class NativeModuleComponentFactory(dynamicLevel: () => WeaveResourceResolver, sy
val weaveResourceResolver = dynamicLevel()
val currentClassloader: ModuleParsingPhasesManager = ModuleParsingPhasesManager(ModuleLoaderManager(Seq(ModuleLoader(weaveResourceResolver)), new SPIBasedModuleLoaderProvider(weaveResourceResolver)))
val parser: CompositeModuleParsingPhasesManager = CompositeModuleParsingPhasesManager(NativeSystemModuleComponents.systemModuleParser, currentClassloader)
val compiler: CustomRuntimeModuleNodeCompiler = RuntimeModuleNodeCompiler.chain(currentClassloader, systemModuleCompiler, parentLast = !systemFirst)
val compiler = RuntimeModuleNodeCompiler.chain(currentClassloader, systemModuleCompiler, parentLast = !systemFirst)
ModuleComponents(new TwoLevelWeaveResourceResolver(NativeSystemModuleComponents.systemResourceResolver, () => weaveResourceResolver), parser, compiler)
}
}
Expand Down
Loading