From 08e9716a7421730bdf4258eaad6cd78b3f81aab0 Mon Sep 17 00:00:00 2001
From: Zac Spitzer <zac.spitzer@gmail.com>
Date: Fri, 31 May 2024 15:22:20 +0200
Subject: [PATCH] update github actions, add 6.1 build

---
 .github/workflows/main-6.0.yml | 71 ++++++++++++++++++++++++++++++++++
 .github/workflows/main.yml     |  4 +-
 2 files changed, 73 insertions(+), 2 deletions(-)
 create mode 100644 .github/workflows/main-6.0.yml

diff --git a/.github/workflows/main-6.0.yml b/.github/workflows/main-6.0.yml
new file mode 100644
index 0000000..a87392c
--- /dev/null
+++ b/.github/workflows/main-6.0.yml
@@ -0,0 +1,71 @@
+# This workflow will build a Java project with Ant
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant
+
+name: Java CI - Lucee 6.0
+
+on: [push, pull_request, workflow_dispatch]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    services:
+      redis:
+        # Docker Hub image
+        image: redis
+        # Set health checks to wait until redis has started
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+        ports:
+          # Maps port 6379 on service container to the host
+          - 6379:6379
+    env:
+      luceeVersion: light-6.0.0.451-BETA
+      luceeVersionQuery: 6.0/snapshot/light
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2
+        key: lucee-script-runner-maven-cache
+    - name: Cache Lucee files
+      uses: actions/cache@v4
+      with:
+        path: _actions/lucee/script-runner/main/lucee-download-cache
+        key: lucee-downloads-${{ env.luceeVersion }}
+        restore-keys: |
+          lucee-downloads
+    - name: Build with Ant
+      run: ant -noinput -verbose -buildfile build.xml
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: redis-lex
+        path: dist/*.lex
+    - name: Checkout Lucee
+      uses: actions/checkout@v4
+      with:
+        repository: lucee/lucee
+        path: lucee
+    - name: Run Lucee Test Suite, labels="redis"
+      uses: lucee/script-runner@main
+      with:
+        webroot: ${{ github.workspace }}/lucee/test
+        execute: /bootstrap-tests.cfm
+        luceeVersion: ${{ env.luceeVersion }}
+        extensionDir: ${{ github.workspace }}/dist
+      env:
+        testLabels: redis
+        testAdditional: ${{ github.workspace }}/tests
+        REDIS_PORT: 6379
+        REDIS_SERVER: localhost
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 11be7cf..628ca77 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,7 +1,7 @@
 # This workflow will build a Java project with Ant
 # For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-ant
 
-name: Java CI - Lucee 6
+name: Java CI - Lucee 6.1
 
 on: [push, pull_request, workflow_dispatch]
 
@@ -24,7 +24,7 @@ jobs:
           - 6379:6379
     env:
       luceeVersion: light-6.0.0.451-BETA
-      luceeVersionQuery: 6.0/snapshot/light
+      luceeVersionQuery: 6.1/snapshot/light
 
     steps:
     - uses: actions/checkout@v4