chore: fix e2e tests

Author: tinesoft

.github/workflows/ci.yml

@@ -18,7 +18,8 @@ jobs:
       NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
       ANDROID_SDK_VERSION: 34
       FLUTTER_VERSION: 3.19.3
-      JDK_VERSION: 17.0.11
+      JDK_VERSION: 24
+      JDK_DISTRO: tem
       JAVA_OPTIONS: '-Xmx3g'
     timeout-minutes: 120
     steps:
@@ -36,7 +37,7 @@ jobs:
 
       # Connect your workspace on nx.app and uncomment this to enable task distribution.
       # The "--stop-agents-after" is optional, but allows idle agents to shut down once the "e2e" targets have been requested
-      - run: bunx nx-cloud start-ci-run --distribute-on=".nx/workflows/distribution-config.yaml" --stop-agents-after="e2e-ci" --with-env-vars="ANDROID_SDK_VERSION,FLUTTER_VERSION,JDK_VERSION"
+      - run: bunx nx-cloud start-ci-run --distribute-on=".nx/workflows/distribution-config.yaml" --stop-agents-after="e2e-ci" --with-env-vars="ANDROID_SDK_VERSION,FLUTTER_VERSION,JDK_VERSION,JDK_DISTRO,JAVA_OPTIONS"
 
       # This line is needed for nx affected to work when CI is running on a PR
       - run: git branch --track develop origin/develop || exit 0

.nx/workflows/agents.yaml

@@ -93,17 +93,19 @@ launch-templates:
           source $HOME/.sdkman/bin/sdkman-init.sh
           sdk version
 
-          jdkVersion="${JDK_VERSION:-21.0.3}"
+          jdkVersion="${JDK_VERSION:-21.0.6}"
           jdkDistro="${JDK_DISTRO:-ms}"
           javaVersion="${jdkVersion}-${jdkDistro}"
           JAVA_HOME="$HOME/.sdkman/candidates/java/$javaVersion"
 
           if [ ! -d $JAVA_HOME ]; then
             echo "⌛️ Installing  Java v$javaVersion.."
-            sdk install java $javaVersion
+            yes | sdk install java $javaVersion
             sdk use java $javaVersion
           else
-             echo "⏭️ Java v$javaVersion already installed. Skipping it"
+            echo "⏭️ Java v$javaVersion already installed. Making sure it is used"
+            sdk use java $javaVersion
+
           fi
 
           echo "JAVA_HOME=$JAVA_HOME" >> $NX_CLOUD_ENV

e2e/nx-melos-e2e/tests/nx-melos.spec.ts

@@ -59,7 +59,7 @@ describe('nx-melos e2e', () => {
     const scripts = [
       {
         name: 'melos-bootstrap',
-        output: `Successfully ran target melos-bootstrap for project @test-project/source`,
+        output: `Successfully ran target melos-bootstrap for project @test-project-melos/source`,
       },
     ];
 

packages/common/testing/utils.ts

@@ -74,13 +74,10 @@ export function octal(value: string | number): number {
 }
 
 export function noFormat(str: string) {
-  return (
-    str
-      // Clean output: https://github.com/nrwl/nx/blob/c0fd00df6e4b0a9dcc0f75b0539e0eb7a34dd63d/packages/plugin/src/utils/testing-utils/commands.ts#L40
-      ?.replace(
-        // eslint-disable-next-line no-control-regex
-        /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
-        ''
-      )
+  // Remove log colors for fail proof string search
+  return str?.replace(
+    // eslint-disable-next-line no-control-regex
+    /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g,
+    ''
   );
 }