add support for concurrent runs, better agent support, running a locally built jar

.github/workflows/main.yml

@@ -31,13 +31,13 @@ jobs:
         run: ant -DluceeVersionQuery="6/all/jar" -Dexecute="/debug.cfm"
 
       - name: Run Lucee 6 Stable
-        run: ant -DluceeVersion="6.0.3.1" -Dexecute="/debug.cfm" -Dtruth="cfml rocks" -Dauthor="Zac Spitzer"
+        run: ant -DluceeVersion="6.2.2.91" -Dexecute="/debug.cfm" -Dtruth="cfml rocks" -Dauthor="Zac Spitzer"
 
       - name: Run Lucee 5 (using Lucee light, no extensions)
         run: ant -DluceeVersion="light-5.4.2.17" -Dexecute="/debug.cfm"
 
       - name: Run Lucee 6 (using Lucee zero, no extensions, no admin, no docs)
-        run: ant -DluceeVersion="zero-6.0.3.1" -Dexecute="/debug.cfm"
+        run: ant -DluceeVersion="zero-6.2.2.91" -Dexecute="/debug.cfm"
 
       - name: Run Latest Lucee 5 RC Light
         run: ant -DluceeVersionQuery="5/rc/light" -Dexecute="/debug.cfm"
@@ -48,3 +48,9 @@ jobs:
       - name: Run Latest Stable Lucee 5, compile webroot (invalid code)
         continue-on-error: true
         run: ant -DluceeVersionQuery="5/stable/jar" -Dexecute="/index.cfm" -Dcompile="true" -Dwebroot="${{ github.workspace }}/sampleBad/"
+
+      - name: Test concurrent execution with unique working directories
+        run: |
+          ant -DuniqueWorkingDir="true" -Dexecute="/debug.cfm" &
+          ant -DuniqueWorkingDir="true" -Dexecute="/debug.cfm" &
+          wait

.github/workflows/webroot-matrix.yml

@@ -0,0 +1,228 @@
+name: Webroot Handling Matrix
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+jobs:
+  macos-bash:
+    name: MacOS Bash
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Run all webroot/execute combinations
+        shell: bash
+        env:
+          LUCEE_VERSION_QUERY: 7/all/zero
+        working-directory: ${{ github.workspace }}/tests/webroot
+        run: |
+          luceeVersionQuery="${LUCEE_VERSION_QUERY:-7/all/zero}"
+          pwd
+          webroots=( '.' "${{ github.workspace }}/tests/webroot" )
+          executes=( 'index.cfm' 'test.cfm' 'sub/test.cfm' )
+          failed=0
+          for w in "${webroots[@]}"; do
+            for e in "${executes[@]}"; do
+              echo "ant -buildfile ../../build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery"
+              ant -buildfile ../../build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery="$luceeVersionQuery"
+              if [ $? -ne 0 ]; then
+                failed=1
+                platform="macos-latest"
+                shell="bash"
+                echo -e "## Platform: $platform | Shell: $shell\n(pwd): $(pwd)\n### ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery\nFAILED: $w / $e\n" >> "$GITHUB_STEP_SUMMARY"
+              fi
+            done
+          done
+          exit $failed
+  ubuntu-bash:
+    name: Ubuntu Bash
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Run all webroot/execute combinations
+        shell: bash
+        env:
+          LUCEE_VERSION_QUERY: 7/all/zero
+        working-directory: ${{ github.workspace }}/tests/webroot
+        run: |
+          luceeVersionQuery="${LUCEE_VERSION_QUERY:-7/all/zero}"
+          pwd
+          webroots=( '.' "${{ github.workspace }}/tests/webroot" )
+          executes=( 'index.cfm' 'test.cfm' 'sub/test.cfm' )
+          failed=0
+          for w in "${webroots[@]}"; do
+            for e in "${executes[@]}"; do
+              echo "ant -buildfile ../../build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery"
+              ant -buildfile ../../build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery="$luceeVersionQuery"
+              if [ $? -ne 0 ]; then
+                failed=1
+                platform="ubuntu-latest"
+                shell="bash"
+                echo -e "## Platform: $platform | Shell: $shell\n(pwd): $(pwd)\n### ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery\nFAILED: $w / $e\n" >> "$GITHUB_STEP_SUMMARY"
+              fi
+            done
+          done
+          exit $failed
+
+  windows-cmd:
+    name: Windows CMD
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Run all webroot/execute combinations
+        shell: cmd
+        env:
+          LUCEE_VERSION_QUERY: 7/all/zero
+        working-directory: ${{ github.workspace }}/tests/webroot
+        run: |
+          @echo off
+          setlocal enabledelayedexpansion
+          for %%w in (.) do (
+            for %%e in (index.cfm test.cfm sub\test.cfm) do (
+              echo %%w / %%e
+              ant -buildfile=..\..\build.xml "-Dwebroot=%%w" "-Dexecute=%%e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=%LUCEE_VERSION_QUERY%
+              if errorlevel 1 (
+                set cmd=ant -buildfile=build.xml -Dwebroot=%%w -Dexecute=%%e -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=%LUCEE_VERSION_QUERY%
+                echo FAILED: %%w / %%e: !cmd!>> %GITHUB_STEP_SUMMARY%
+                echo(>> %GITHUB_STEP_SUMMARY%
+                exit /b 1
+              )
+            )
+          )
+          for %%w in ("%GITHUB_WORKSPACE%\tests\webroot") do (
+            for %%e in (index.cfm test.cfm sub/test.cfm) do (
+              ant -buildfile=..\..\build.xml -Dwebroot=%%w -Dexecute=%%e -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=%LUCEE_VERSION_QUERY%
+              if errorlevel 1 (
+                set cmd=ant -buildfile=build.xml -Dwebroot=%%w -Dexecute=%%e -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=%LUCEE_VERSION_QUERY%
+                echo FAILED: %%w / %%e: !cmd!>> %GITHUB_STEP_SUMMARY%
+                echo(>> %GITHUB_STEP_SUMMARY%
+                exit /b 1
+              )
+            )
+          )
+
+          endlocal
+  windows-pwsh:
+    name: Windows PowerShell
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Run all webroot/execute combinations
+        shell: pwsh
+        env:
+          LUCEE_VERSION_QUERY: 7/all/zero
+        working-directory: ${{ github.workspace }}/tests/webroot
+        run: |
+          $webroots = @('.', "${{ github.workspace }}\tests\webroot")
+          pwd
+          $executes = @('index.cfm', 'test.cfm', 'sub/test.cfm')
+          foreach ($w in $webroots) {
+            foreach ($e in $executes) {
+              $luceeVersionQuery = $env:LUCEE_VERSION_QUERY
+              $cmd = "ant -buildfile=../../build.xml `"-Dwebroot=$w`" `"-Dexecute=$e`" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery"
+              Write-Host $cmd
+              $LASTEXITCODE = 0
+              iex $cmd
+              if ($LASTEXITCODE -ne 0) {
+                $cmd = "ant -buildfile=../../build.xml `"-Dwebroot=$w`" `"-Dexecute=$e`" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery"
+                $platform = "windows-latest"
+                $shell = "pwsh"
+                $summary = @()
+                $summary += "## Platform: $platform | Shell: $shell"
+                $summary += "(pwd): $(pwd)"
+                $summary += "### $cmd"
+                $summary += "FAILED: $w / $e"
+                $summary -join "`n" | Out-File -Append -FilePath $env:GITHUB_STEP_SUMMARY
+              }
+            }
+          }
+  windows-bash:
+    name: Windows Bash
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Cache Maven packages
+        uses: actions/cache@v4
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Set up Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+      - name: Run all webroot/execute combinations
+        shell: bash
+        env:
+          LUCEE_VERSION_QUERY: 7/all/zero
+        working-directory: ${{ github.workspace }}/tests/webroot
+        run: |
+          luceeVersionQuery="${LUCEE_VERSION_QUERY:-7/all/zero}"
+          webroots=( '.' "${{ github.workspace }}/tests/webroot" )
+          executes=( 'index.cfm' 'test.cfm' 'sub/test.cfm' )
+          failed=0
+          for w in "${webroots[@]}"; do
+            for e in "${executes[@]}"; do
+              echo "ant -buildfile ../../build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery"
+              ant -buildfile ../../build.xml -Dwebroot=$w -Dexecute="$e" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery="$luceeVersionQuery"
+              if [ $? -ne 0 ]; then
+                failed=1
+                platform="windows-latest"
+                shell="bash"
+                echo -e "## Platform: $platform | Shell: $shell\n### ant -buildfile build.xml -Dwebroot=$w -Dexecute=\"$e\" -DpreCleanup=false -DpostCleanup=false -DluceeVersionQuery=$luceeVersionQuery\nFAILED: $w / $e\n" >> "$GITHUB_STEP_SUMMARY"
+              fi
+            done
+          done
+          exit $failed

.gitignore

@@ -1,3 +1,6 @@
 lucee-download-cache
 temp
 bin
+logs
+/temp-unique
+/agent-tests

CHANGELOG.md

@@ -0,0 +1,62 @@
+# Changelog
+
+All notable changes to the Lucee Script Runner project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+### Added
+- **Local JAR Support**: Added `luceeJar` parameter to test locally built Lucee JARs without publishing
+  - Accepts full path to a local JAR file
+  - Overrides both `luceeVersion` and `luceeVersionQuery`
+  - Perfect for Lucee core developers testing builds
+- **Unique Working Directories**: Added `uniqueWorkingDir` parameter with three modes:
+  - `false` (default): Uses standard temp/lucee directory
+  - `true`: Auto-generates unique directory with timestamp and random ID
+  - Custom path: Uses specified directory path
+- **Concurrent Execution Support**: Multiple script-runner instances can now run simultaneously without conflicts
+- **Race Condition Detection**: Automatic detection and prevention of directory conflicts
+- **Improved JFR Logging**: 
+  - JFR files now output to organized `logs/` directory
+  - Descriptive filenames: `timestamp-lucee-version-webroot-script-javaversion.jfr`
+  - Added `logs/` to `.gitignore`
+- **Enhanced Error Messages**: 
+  - Git Bash path conversion detection with specific solutions
+  - Execute script validation with exact file path shown
+  - Windows trailing backslash validation
+- **Cross-Platform Path Handling**: Robust path concatenation logic for Windows and Unix systems
+
+### Changed
+- **Updated Lucee Version**: Standardized all references to version 6.2.2.91 across codebase
+- **JFR Filename Format**: Changed from `lucee-version.jar-javaversion.jfr` to descriptive format with timestamp and context
+- **Documentation**: Updated README.md with comprehensive working directory behavior explanations
+
+### Fixed
+- **File Path Validation Bug**: Fixed concatenation logic for execute script validation
+- **Git Bash Path Conversion Issues**: Added detection and helpful error messages for MSYS path conversion problems
+- **Build Script Path Resolution**: Fixed relative path issues when using unique working directories
+
+### Technical Details
+
+#### New Ant Properties
+- `uniqueWorkingDir`: Controls working directory behavior
+- `webroot.name`: Extracted basename of webroot for JFR filenames
+- `execute.clean`: Cleaned execute path (removes leading slashes) for JFR filenames
+- `execute.fullpath`: Properly concatenated full path for file validation
+
+#### Build Process Improvements
+- Added `set-unique-working-dir` target with timestamp generation and race condition checks
+- Enhanced `run-cfml` target with improved validation and path handling
+- Updated GitHub Actions workflow with concurrent execution tests
+
+#### Error Handling
+- Early validation of execute script existence under webroot
+- Specific error messages for common Git Bash issues
+- Clear guidance on workarounds and solutions
+
+### Migration Notes
+- Existing usage remains unchanged (backward compatible)
+- New JFR files will appear in `logs/` directory instead of project root
+- Git users should add `logs/` to their `.gitignore` if not already present