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

Update to 2.6.0-SNAPSHOT #90

Merged
merged 4 commits into from
Nov 10, 2023
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
15 changes: 9 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
OSX_LINUX_WINDOWS:
strategy:
matrix:
os: [macos-latest, ubuntu-latest, windows-latest]
os: [ macos-latest, ubuntu-latest, windows-latest ]
include:
- os: windows-latest
script_name: windows
Expand All @@ -30,7 +30,7 @@ jobs:
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

# Read graalvm version
- name: Read Graalvm version
run: |
Expand All @@ -51,13 +51,16 @@ jobs:
run: |
./gradlew --stacktrace build
shell: bash

#Run regression tests
- name: Run regression test 2.5
- name: Run regression test 2.6
run: |
./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0-SNAPSHOT native-cli-integration-tests:test
./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.0-SNAPSHOT native-cli-integration-tests:test
shell: bash
#Run regression tests
- name: Run regression test 2.5.x
run: |
./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0 native-cli-integration-tests:test
shell: bash

- name: Run regression test 2.4
run: |
./gradlew --stacktrace -PweaveTestSuiteVersion=2.4.0-HF-SNAPSHOT native-cli-integration-tests:test
Expand Down
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
weaveVersion=2.5.0-SNAPSHOT
weaveTestSuiteVersion=2.5.0-SNAPSHOT
weaveVersion=2.6.0-SNAPSHOT
weaveTestSuiteVersion=2.6.0-SNAPSHOT
nativeVersion=100.100.100
scalaVersion=2.12.15
ioVersion=1.0.0-SNAPSHOT
graalvmVersion=22.3.0
graalvmVersion=22.3.3
#Libaries
scalaTestVersion=3.2.15
scalaTestPluginVersion=0.32
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ class NativeCliRuntimeIT extends AnyFunSpec

override def ignoreTests(): Array[String] = {
// Encoding issues
val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string" ) ++
val baseArray = Array("csv-invalid-utf8", "splitBy-regex", "splitBy-string", "xml-encoding-decl-near", "xml-encoding-decl-far") ++
// Fail in java11 because broken backwards
Array("coerciones_toString", "date-coercion") ++
// Use resources (dwl files) that is present in the Tests but not in Cli (e.g: org::mule::weave::v2::libs::)
Expand Down
3 changes: 2 additions & 1 deletion native-cli/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,10 @@ dependencies {
implementation group: 'org.mule.weave', name: 'core-modules', version: weaveVersion
implementation group: 'org.mule.weave', name: 'yaml-module', version: weaveVersion
implementation group: 'org.mule.weave', name: 'jsonschema-module', version: weaveVersion
implementation group: 'org.mule.weave', name: 'xmlschema-module', version: weaveVersion
implementation group: 'org.mule.weave', name: 'http-module', version: ioVersion
implementation group: 'org.mule.weave', name: 'process-module', version: ioVersion
implementation group: 'org.mule.weave', name: 'migrant', version: '2.5.0-SNAPSHOT'
implementation group: 'org.mule.weave', name: 'migrant', version: weaveVersion
implementation(group: 'org.mule.weave', name: 'http-netty-module', version: ioVersion) {
exclude group: 'org.slf4j'
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class PicoMigrate implements Callable<Integer> {

@CommandLine.Parameters(
index = "0",
arity = "0..1",
arity = "1",
description = "The path to the dw1 file."
)
private File dw1File = null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ protected Integer doCall() {

int lastUpdate = utils.daysSinceLastUpdate();
if (lastUpdate > 30) {
console.info("Your spells are getting old. " + lastUpdate + " days since last update. Please run \n dw update-spells");
console.info("Your spells are getting old. " + lastUpdate + " days since last update. Please run \n dw spell update");
}

File spellFolder;
Expand Down
Loading