Merge pull request #5 from lucee/LDEV-5137-update-to-42.7.4

LDEV-5137 update postgres jdbc to 42.7.4
lucee · Nov 5, 2024 · a00f31b · a00f31b
2 parents dfd4877 + 036aed0
commit a00f31b
Show file tree

Hide file tree

Showing 4 changed files with 142 additions and 21 deletions.
diff --git a/.github/workflows/main-5.4.yml b/.github/workflows/main-5.4.yml
@@ -0,0 +1,63 @@
+# 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 - 5.4
+
+on: [push, pull_request,workflow_dispatch]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      luceeVersionQuery: 5.4/all/light
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 11
+      uses: actions/setup-java@v4
+      with:
+        java-version: '11'
+        distribution: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2
+        key: maven-cache
+    - name: Cache Lucee files
+      uses: actions/cache@v4
+      with:
+        path: _actions/lucee/script-runner/main/lucee-download-cache
+        key: lucee-downloads
+    - name: Set up postgres (local)
+      run: |
+        sudo /etc/init.d/postgresql start
+        sudo -u postgres psql -c 'create database lucee;'
+        sudo -u postgres psql -c "create user lucee with encrypted password 'lucee'";
+        sudo -u postgres psql -c 'grant all privileges on database lucee to lucee;'
+    - name: Build extension-jdbc-postgres with Ant
+      run: ant -noinput -verbose -buildfile build.xml
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: postgres-lex
+        path: dist/*.lex
+    - name: Checkout Lucee
+      uses: actions/checkout@v4
+      with:
+        repository: lucee/lucee
+        path: lucee
+    - name: Run Lucee Test Suite, labels="postgres"
+      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
+      env:
+        testLabels: postgres
+        POSTGRES_SERVER: localhost
+        POSTGRES_USERNAME: lucee
+        POSTGRES_PASSWORD: lucee
+        POSTGRES_PORT: 5432
+        POSTGRES_DATABASE: lucee
diff --git a/.github/workflows/main-6.0.yml b/.github/workflows/main-6.0.yml
@@ -0,0 +1,64 @@
+# 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 - 6.0
+
+on: [push, pull_request,workflow_dispatch]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+    env:
+      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: 'adopt'
+    - name: Cache Maven packages
+      uses: actions/cache@v4
+      with:
+        path: ~/.m2
+        key: maven-cache
+    - name: Cache Lucee files
+      uses: actions/cache@v4
+      with:
+        path: _actions/lucee/script-runner/main/lucee-download-cache
+        key: lucee-downloads
+    - name: Set up Postgres (local)
+      run: |
+        sudo /etc/init.d/postgresql start
+        sudo -u postgres psql -c 'create database lucee;'
+        sudo -u postgres psql -c "create user lucee with encrypted password 'lucee'";
+        sudo -u postgres psql -c 'grant all privileges on database lucee to lucee;'
+
+    - name: Build extension-jdbc-postgres with Ant
+      run: ant -noinput -verbose -buildfile build.xml
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: postgres-lex
+        path: dist/*.lex
+    - name: Checkout Lucee
+      uses: actions/checkout@v4
+      with:
+        repository: lucee/lucee
+        path: lucee
+    - name: Run Lucee Test Suite, labels="postgres"
+      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
+      env:
+        testLabels: postgres
+        POSTGRES_SERVER: localhost
+        POSTGRES_USERNAME: lucee
+        POSTGRES_PASSWORD: lucee
+        POSTGRES_PORT: 5432
+        POSTGRES_DATABASE: lucee
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -1,54 +1,48 @@
 # 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
+name: Java CI - Lucee Latest
 
 on: [push, pull_request,workflow_dispatch]
- 
+
 jobs:
   build:
 
-    runs-on: ubuntu-latest   
+    runs-on: ubuntu-latest
     env:
-      luceeVersion: light-6.0.0.149-SNAPSHOT
-
+      luceeVersionQuery: 0/all/light
     steps:
-    - uses: actions/checkout@v2   
+    - uses: actions/checkout@v4
     - name: Set up JDK 11
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4
       with:
         java-version: '11'
         distribution: 'adopt'
     - name: Cache Maven packages
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: ~/.m2
-        key: lucee-postgres
-        restore-keys: |
-          ${{ runner.os }}-m2
-          maven-cache
+        key: maven-cache
     - name: Cache Lucee files
-      uses: actions/cache@v2
+      uses: actions/cache@v4
       with:
         path: _actions/lucee/script-runner/main/lucee-download-cache
-        key: lucee-downloads-${{ env.luceeVersion }}
-        restore-keys: |
-          lucee-downloads
+        key: lucee-downloads
     - name: Set up Postgres (local)
       run: |
         sudo /etc/init.d/postgresql start
         sudo -u postgres psql -c 'create database lucee;'
         sudo -u postgres psql -c "create user lucee with encrypted password 'lucee'";
-        sudo -u postgres psql -c 'grant all privileges on database lucee to lucee;'         
-    - name: Build extension-jdbc-postgresql with Ant
+        sudo -u postgres psql -c 'grant all privileges on database lucee to lucee;'
+    - name: Build extension-jdbc-postgres with Ant
       run: ant -noinput -verbose -buildfile build.xml
     - name: Upload Artifact
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: postgres-lex
         path: dist/*.lex
     - name: Checkout Lucee
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
       with:
         repository: lucee/lucee
         path: lucee
@@ -58,8 +52,8 @@ jobs:
         webroot: ${{ github.workspace }}/lucee/test
         execute: /bootstrap-tests.cfm
         luceeVersion: ${{ env.luceeVersion }}
+        luceeVersionQuery: ${{ env.luceeVersionQuery }}
         extensionDir: ${{ github.workspace }}/dist
-        extensions: 8D7FB0DF-08BB-1589-FE3975678F07DB17,37C61C0A-5D7E-4256-8572639BE0CF5838,FAD1E8CB-4F45-4184-86359145767C29DE # the compress, orm and esapi extensiona are required to run tests lucee with lucee-light
       env:
         testLabels: postgres
         POSTGRES_SERVER: localhost

diff --git a/postgresql-42.7.3.jar → postgresql-42.7.4.jar b/postgresql-42.7.3.jar → postgresql-42.7.4.jar