update github actions

lucee · May 31, 2024 · 0b126ea · 0b126ea
1 parent 49ddb3a
commit 0b126ea
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 19 deletions.
diff --git a/.github/workflows/main-5.4.yml b/.github/workflows/main-5.4.yml
@@ -1,6 +1,3 @@
-# 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 5.4
 
 on: 
@@ -18,31 +15,31 @@ jobs:
       luceeVersion: light-5.4.0.77-RC
       luceeVersionQuery: 5.4/all/light
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
     - name: Cache Maven packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: lucee-script-runner-maven-cache
     - name: Cache Lucee files
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
         key: lucee-downloads
     - name: Build with Ant
       run: ant -noinput -verbose -buildfile build.xml
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: pdf-lex
         path: dist/*.lex
     - name: Checkout Lucee
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: lucee/lucee
         path: lucee

diff --git a/.github/workflows/main-6.0.yml b/.github/workflows/main-6.0.yml
@@ -0,0 +1,57 @@
+name: Java CI - Lucee 6.0
+
+on: 
+  push:
+    branches:
+      - '**' # thus ignoring tagging
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      luceeVersion: light-6.0.0.451-BETA
+      luceeVersionQuery: 6.0/all/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: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
+        key: lucee-downloads
+    - name: Build with Ant
+      run: ant -noinput -verbose -buildfile build.xml
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: pdf-lex
+        path: dist/*.lex
+    - name: Checkout Lucee
+      uses: actions/checkout@v4
+      with:
+        repository: lucee/lucee
+        path: lucee
+    - name: Run Lucee Test Suite
+      uses: lucee/script-runner@main
+      with:
+        webroot: ${{ github.workspace }}/lucee/test
+        execute: /bootstrap-tests.cfm
+        luceeVersion: ${{ env.luceeVersion }}
+        luceeVersionQuery: ${{ env.luceeVersionQuery }}
+        extensionDir: ${{ github.workspace }}/dist
+        extensions: B737ABC4-D43F-4D91-8E8E973E37C40D1B # image-ext for tests
+      env:
+        testLabels: pdf
+        testAdditional: ${{ github.workspace }}/tests
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,7 +1,4 @@
-# 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 latest
 
 on: 
   push:
@@ -18,31 +15,31 @@ jobs:
       luceeVersion: light-6.0.0.451-BETA
       luceeVersionQuery: 0/all/light
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v3
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'temurin'
     - name: Cache Maven packages
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.m2
         key: lucee-script-runner-maven-cache
     - name: Cache Lucee files
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/work/_actions/lucee/script-runner/main/lucee-download-cache
         key: lucee-downloads
     - name: Build with Ant
       run: ant -noinput -verbose -buildfile build.xml
     - name: Upload Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: pdf-lex
         path: dist/*.lex
     - name: Checkout Lucee
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         repository: lucee/lucee
         path: lucee