From 335529f97b39112391b21909b9140af9a2a5bf3e Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:13:38 -0400 Subject: [PATCH 01/10] Create cbtest.yml First pass at a GitHub Action to install and run testbox via commandbox --- .github/workflows/cbtest.yml | 50 ++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 .github/workflows/cbtest.yml diff --git a/.github/workflows/cbtest.yml b/.github/workflows/cbtest.yml new file mode 100644 index 00000000..98bea498 --- /dev/null +++ b/.github/workflows/cbtest.yml @@ -0,0 +1,50 @@ +# This workflow will build a Java project with Ant +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant + +name: Java CI + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + +jobs: + build: + strategy: + matrix: + version: [ lucee@6, lucee@5, lucee@4.5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, adobe@11, adobe@10, boxlang@be ] + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Set up JDK 11 + uses: actions/setup-java@v3 + with: + java-version: '11' + distribution: 'temurin' + + - name: Install the ortus security key + run: apt-key adv --keyserver keys.gnupg.net --recv 6DA70622 + + - name: Add the commandbox source + run: sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list + + - name: Update apt and install commandbox + run: sudo apt-get update && sudo apt-get --assume-yes install commandbox + + - name: Install dependencies + run: box install + + - name: Start the ${{ matrix.engine }} CFML engine + run: box server start cfengine=${{ matrix.engine }} port=8500 openbrowser=false + + - name: Run test + run: box testbox run reporter=mintext > ${{ matrix.engine }}_output.log + + - name: Upload output file + uses: actions/upload-artifact@v4 + with: + name: output-log-file + path: ${{ matrix.engine }}_output.log From e9901c74294fb6d26ff8278b9bad1cb5feaa83b7 Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:22:20 -0400 Subject: [PATCH 02/10] Update cbtest.yml --- .github/workflows/cbtest.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cbtest.yml b/.github/workflows/cbtest.yml index 98bea498..d9b04ca6 100644 --- a/.github/workflows/cbtest.yml +++ b/.github/workflows/cbtest.yml @@ -26,13 +26,13 @@ jobs: distribution: 'temurin' - name: Install the ortus security key - run: apt-key adv --keyserver keys.gnupg.net --recv 6DA70622 + run: curl -fsSl https://downloads.ortussolutions.com/debs/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/ortussolutions.gpg > /dev/null - name: Add the commandbox source - run: sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list + run: echo "deb [signed-by=/usr/share/keyrings/ortussolutions.gpg] https://downloads.ortussolutions.com/debs/noarch /" | sudo tee /etc/apt/sources.list.d/commandbox.list - name: Update apt and install commandbox - run: sudo apt-get update && sudo apt-get --assume-yes install commandbox + run: sudo apt-get update && sudo apt-get install apt-transport-https commandbox - name: Install dependencies run: box install From 863ef5659a20fdcdf98183ca7757babe3f05cd62 Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:26:59 -0400 Subject: [PATCH 03/10] Update cbtest.yml Fix bugs --- .github/workflows/cbtest.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cbtest.yml b/.github/workflows/cbtest.yml index d9b04ca6..26c1f563 100644 --- a/.github/workflows/cbtest.yml +++ b/.github/workflows/cbtest.yml @@ -1,7 +1,4 @@ -# This workflow will build a Java project with Ant -# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-ant - -name: Java CI +name: fw1 CI on: push: @@ -13,7 +10,7 @@ jobs: build: strategy: matrix: - version: [ lucee@6, lucee@5, lucee@4.5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, adobe@11, adobe@10, boxlang@be ] + engine: [ lucee@6, lucee@5, lucee@4.5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, adobe@11, adobe@10, boxlang@be ] runs-on: ubuntu-latest From 6c09504280cf8575c702a2bdc1fa98893483722a Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:30:33 -0400 Subject: [PATCH 04/10] Update cbtest.yml Remove output to file to further diagnose issues with testbox running --- .github/workflows/cbtest.yml | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/.github/workflows/cbtest.yml b/.github/workflows/cbtest.yml index 26c1f563..5cf377f5 100644 --- a/.github/workflows/cbtest.yml +++ b/.github/workflows/cbtest.yml @@ -38,10 +38,4 @@ jobs: run: box server start cfengine=${{ matrix.engine }} port=8500 openbrowser=false - name: Run test - run: box testbox run reporter=mintext > ${{ matrix.engine }}_output.log - - - name: Upload output file - uses: actions/upload-artifact@v4 - with: - name: output-log-file - path: ${{ matrix.engine }}_output.log + run: box testbox run reporter=mintext From d5161891181f9004308316c879180d902bfa7a3c Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:34:38 -0400 Subject: [PATCH 05/10] Update cbtest.yml Reduce engines being tested to check for continued NPE --- .github/workflows/cbtest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cbtest.yml b/.github/workflows/cbtest.yml index 5cf377f5..12ce5735 100644 --- a/.github/workflows/cbtest.yml +++ b/.github/workflows/cbtest.yml @@ -10,7 +10,7 @@ jobs: build: strategy: matrix: - engine: [ lucee@6, lucee@5, lucee@4.5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, adobe@11, adobe@10, boxlang@be ] + engine: [ adobe@2023 ] runs-on: ubuntu-latest From 65bc073db64a6459e651b15756d63c122282f4b6 Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:38:17 -0400 Subject: [PATCH 06/10] Update cbtest.yml Remove adobe 10 from testing for NPE and try the remaining engines after successful test of ACF2023 --- .github/workflows/cbtest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cbtest.yml b/.github/workflows/cbtest.yml index 12ce5735..b0074286 100644 --- a/.github/workflows/cbtest.yml +++ b/.github/workflows/cbtest.yml @@ -7,10 +7,10 @@ on: branches: [ "develop" ] jobs: - build: + test: strategy: matrix: - engine: [ adobe@2023 ] + engine: [ lucee@6, lucee@5, lucee@4.5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, adobe@11, boxlang@be ] runs-on: ubuntu-latest From 3a2c047f1436f269dd5d8fc59e1a9e4acf9bd744 Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:45:59 -0400 Subject: [PATCH 07/10] Update and rename cbtest.yml to fw1_java11.yml Going to have to get specific with Java versions (duh, don't judge - it's late lol) so setting up what should run on Java 11 --- .github/workflows/{cbtest.yml => fw1_java11.yml} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename .github/workflows/{cbtest.yml => fw1_java11.yml} (90%) diff --git a/.github/workflows/cbtest.yml b/.github/workflows/fw1_java11.yml similarity index 90% rename from .github/workflows/cbtest.yml rename to .github/workflows/fw1_java11.yml index b0074286..71f1cd97 100644 --- a/.github/workflows/cbtest.yml +++ b/.github/workflows/fw1_java11.yml @@ -10,7 +10,7 @@ jobs: test: strategy: matrix: - engine: [ lucee@6, lucee@5, lucee@4.5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, adobe@11, boxlang@be ] + engine: [ lucee@6, lucee@5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, boxlang@be ] runs-on: ubuntu-latest From 7cf45953d74f908068fee08afc756ea3296a455b Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:48:38 -0400 Subject: [PATCH 08/10] Remove boxlang boxlang didn't even fire up a server, so... removing until I figure out why (perhaps also Java 11 related) --- .github/workflows/fw1_java11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw1_java11.yml b/.github/workflows/fw1_java11.yml index 71f1cd97..131b8966 100644 --- a/.github/workflows/fw1_java11.yml +++ b/.github/workflows/fw1_java11.yml @@ -10,7 +10,7 @@ jobs: test: strategy: matrix: - engine: [ lucee@6, lucee@5, adobe@2023, adobe@2021, adobe@2018, adobe@2016, boxlang@be ] + engine: [ lucee@6, lucee@5, adobe@2023, adobe@2021, adobe@2018, adobe@2016 ] runs-on: ubuntu-latest From 267c4fb7505491c87ef3d805a1b9077601868d68 Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:51:51 -0400 Subject: [PATCH 09/10] Remove lucee 6 Lucee 6 is failing the rest decode tests, so removing until I have time to look at that --- .github/workflows/fw1_java11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw1_java11.yml b/.github/workflows/fw1_java11.yml index 131b8966..4c9a488f 100644 --- a/.github/workflows/fw1_java11.yml +++ b/.github/workflows/fw1_java11.yml @@ -10,7 +10,7 @@ jobs: test: strategy: matrix: - engine: [ lucee@6, lucee@5, adobe@2023, adobe@2021, adobe@2018, adobe@2016 ] + engine: [ lucee@5, adobe@2023, adobe@2021, adobe@2018, adobe@2016 ] runs-on: ubuntu-latest From 452cd5fa4792fbfc0632332afd8bbfe216bbe73c Mon Sep 17 00:00:00 2001 From: Denard Springle Date: Wed, 22 May 2024 00:53:58 -0400 Subject: [PATCH 10/10] Adjust naming for Java 11 Adjusted the name of the test suite to include the fact that it is a java 11 test suite, since additional tests will be needed for Java 8 for Lucee 4.5, ACF10 and ACF11 --- .github/workflows/fw1_java11.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fw1_java11.yml b/.github/workflows/fw1_java11.yml index 4c9a488f..88d01e10 100644 --- a/.github/workflows/fw1_java11.yml +++ b/.github/workflows/fw1_java11.yml @@ -1,4 +1,4 @@ -name: fw1 CI +name: fw1 Java 11 on: push: