From d3a27233888bd8ab31d87504708e80e11d23715a Mon Sep 17 00:00:00 2001 From: Ana Felisatti Date: Mon, 25 Mar 2024 09:48:50 -0700 Subject: [PATCH 1/6] Update CODEOWNERS --- .github/CODEOWNERS | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e73deb2..06e03b2 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1,3 @@ -* @mulesoft-labs/team-data-weave \ No newline at end of file +#GUSINFO:MS DataWeave,MS DataWeave +* @mulesoft-labs/team-data-weave +#ECCN:Open Source From 5b0672511a48adecc9ba900afab0ef002dcc3100 Mon Sep 17 00:00:00 2001 From: Ana Felisatti Date: Mon, 25 Mar 2024 10:43:12 -0700 Subject: [PATCH 2/6] Update gradle.properties --- gradle.properties | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gradle.properties b/gradle.properties index 35b719a..d0c654d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ -weaveVersion=2.6.0-SNAPSHOT -weaveTestSuiteVersion=2.6.0-SNAPSHOT +weaveVersion=2.7.0-SNAPSHOT +weaveTestSuiteVersion=2.7.0-SNAPSHOT nativeVersion=100.100.100 scalaVersion=2.12.15 ioVersion=1.0.0-SNAPSHOT @@ -8,4 +8,4 @@ graalvmVersion=22.3.3 scalaTestVersion=3.2.15 scalaTestPluginVersion=0.32 -#org.gradle.jvmargs=-Dfile.encoding=utf-8 \ No newline at end of file +#org.gradle.jvmargs=-Dfile.encoding=utf-8 From c4d62a1b5956133cff51551c738b8fdabfa98911 Mon Sep 17 00:00:00 2001 From: Ana Felisatti Date: Tue, 26 Mar 2024 09:06:26 -0700 Subject: [PATCH 3/6] Try to fix build --- .github/workflows/main.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fe515d4..7d1e755 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,11 +17,11 @@ jobs: OSX_LINUX_WINDOWS: strategy: matrix: - os: [ macos-latest, ubuntu-latest, windows-latest ] + os: [ macos-latest, mulesoft-labs-ubuntu, mulesoft-labs-windows ] include: - - os: windows-latest + - os: mulesoft-labs-windows script_name: windows - - os: ubuntu-latest + - os: mulesoft-labs-ubuntu script_name: linux - os: macos-latest script_name: osx @@ -52,14 +52,14 @@ jobs: ./gradlew --stacktrace build shell: bash #Run regression tests - - name: Run regression test 2.6 + - name: Run regression test 2.7 run: | - ./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.0-SNAPSHOT native-cli-integration-tests:test + ./gradlew --stacktrace -PweaveTestSuiteVersion=2.7.0-SNAPSHOT native-cli-integration-tests:test shell: bash #Run regression tests - - name: Run regression test 2.5.x + - name: Run regression test 2.6 run: | - ./gradlew --stacktrace -PweaveTestSuiteVersion=2.5.0 native-cli-integration-tests:test + ./gradlew --stacktrace -PweaveTestSuiteVersion=2.6.1 native-cli-integration-tests:test shell: bash - name: Run regression test 2.4 run: | From 49f949f0933e7588bf53f172094dee042a3ead5b Mon Sep 17 00:00:00 2001 From: Ana Felisatti Date: Tue, 26 Mar 2024 09:09:43 -0700 Subject: [PATCH 4/6] Remove mac for now --- .github/workflows/main.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 7d1e755..b00f0a3 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,14 +17,12 @@ jobs: OSX_LINUX_WINDOWS: strategy: matrix: - os: [ macos-latest, mulesoft-labs-ubuntu, mulesoft-labs-windows ] + os: [ mulesoft-labs-ubuntu, mulesoft-labs-windows ] include: - os: mulesoft-labs-windows script_name: windows - os: mulesoft-labs-ubuntu script_name: linux - - os: macos-latest - script_name: osx runs-on: ${{ matrix.os }} # Steps represent a sequence of tasks that will be executed as part of the job steps: From b8d7b27123d7b59c71c1898ebbf10ce606b259d3 Mon Sep 17 00:00:00 2001 From: Ana Felisatti Date: Tue, 26 Mar 2024 09:22:34 -0700 Subject: [PATCH 5/6] try to fix --- native-cli/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/native-cli/build.gradle b/native-cli/build.gradle index ed5858b..974f8fc 100644 --- a/native-cli/build.gradle +++ b/native-cli/build.gradle @@ -30,7 +30,7 @@ dependencies { 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: weaveVersion + implementation group: 'org.mule.weave', name: 'migrant', version: '2.6.0-SNAPSHOT' implementation(group: 'org.mule.weave', name: 'http-netty-module', version: ioVersion) { exclude group: 'org.slf4j' } @@ -187,4 +187,4 @@ nativeCompile.dependsOn("shadowJar") tasks.named("nativeCompile") { classpathJar = file("${buildDir}/libs/native-cli-" + nativeVersion + "-all.jar") -} \ No newline at end of file +} From d51d5fa3012ce6695dd4ca41ec60cdb171144151 Mon Sep 17 00:00:00 2001 From: Ana Felisatti Date: Tue, 26 Mar 2024 10:18:29 -0700 Subject: [PATCH 6/6] test workers --- .github/workflows/main.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b00f0a3..af69fa2 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,12 +17,14 @@ jobs: OSX_LINUX_WINDOWS: strategy: matrix: - os: [ mulesoft-labs-ubuntu, mulesoft-labs-windows ] + os: [ ubuntu-latest, windows-latest, macos-latest ] include: - - os: mulesoft-labs-windows + - os: windows-latest script_name: windows - - os: mulesoft-labs-ubuntu + - os: ubuntu-latest script_name: linux + - os: macos-latest + script_name: osx runs-on: ${{ matrix.os }} # Steps represent a sequence of tasks that will be executed as part of the job steps: