Skip to content

Commit

Permalink
Merge pull request #6 from lucee/LDEV-4471-mysql-8.1.0
Browse files Browse the repository at this point in the history
LDEV-4471 update to mysql jdbc 8.1.0
  • Loading branch information
zspitzer authored Sep 8, 2023
2 parents f4ad672 + 45b9329 commit be077cd
Show file tree
Hide file tree
Showing 4 changed files with 72 additions and 18 deletions.
64 changes: 64 additions & 0 deletions .github/workflows/main-5.4.yml
Original file line number Diff line number Diff line change
@@ -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 - 5.4

on: [push, pull_request,workflow_dispatch]

jobs:
build:

runs-on: ubuntu-latest
env:
luceeVersionQuery: 5.4/all/light
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'adopt'
- name: Cache Maven packages
uses: actions/cache@v3
with:
path: ~/.m2
key: maven-cache
- name: Cache Lucee files
uses: actions/cache@v3
with:
path: _actions/lucee/script-runner/main/lucee-download-cache
key: lucee-downloads
- name: Set up MySQL (local)
run: |
sudo systemctl start mysql
mysql -e 'CREATE DATABASE lucee' -uroot -proot
mysql -e 'CREATE USER "lucee"@"localhost" IDENTIFIED WITH mysql_native_password BY "lucee";' -uroot -proot
mysql -e 'GRANT ALL PRIVILEGES ON lucee.* TO "lucee"@"localhost"' -uroot -proot
- name: Build extension-jdbc-mysql with Ant
run: ant -noinput -verbose -buildfile build.xml
- name: Upload Artifact
uses: actions/upload-artifact@v3
with:
name: mysql-lex
path: dist/*.lex
- name: Checkout Lucee
uses: actions/checkout@v3
with:
repository: lucee/lucee
path: lucee
- name: Run Lucee Test Suite, labels="mysql"
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: mysql
MYSQL_SERVER: localhost
MYSQL_USERNAME: lucee
MYSQL_PASSWORD: lucee
MYSQL_PORT: 3306
MYSQL_DATABASE: lucee
21 changes: 8 additions & 13 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,15 @@
name: Java CI

on: [push, pull_request,workflow_dispatch]

jobs:
build:

runs-on: ubuntu-latest
runs-on: ubuntu-latest
env:
luceeVersion: light-6.0.0.448-SNAPSHOT

luceeVersionQuery: 0/all/light
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
Expand All @@ -23,24 +22,19 @@ jobs:
uses: actions/cache@v3
with:
path: ~/.m2
key: lucee-mysql
restore-keys: |
${{ runner.os }}-m2
maven-cache
key: maven-cache
- name: Cache Lucee files
uses: actions/cache@v3
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 MySQL (local)
run: |
sudo systemctl start mysql
mysql -e 'CREATE DATABASE lucee' -uroot -proot
mysql -e 'CREATE USER "lucee"@"localhost" IDENTIFIED WITH mysql_native_password BY "lucee";' -uroot -proot
mysql -e 'GRANT ALL PRIVILEGES ON lucee.* TO "lucee"@"localhost"' -uroot -proot
- name: Build extension-jdbc-mysql with Ant
run: ant -noinput -verbose -buildfile build.xml
- name: Upload Artifact
Expand All @@ -59,6 +53,7 @@ jobs:
webroot: ${{ github.workspace }}/lucee/test
execute: /bootstrap-tests.cfm
luceeVersion: ${{ env.luceeVersion }}
luceeVersionQuery: ${{ env.luceeVersionQuery }}
extensionDir: ${{ github.workspace }}/dist
env:
testLabels: mysql
Expand Down
5 changes: 0 additions & 5 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@
<delete dir="${dist}/"/>
</target>






<target name="dist" description="generate the distribution">

<!-- jar -->
Expand Down
Binary file not shown.

0 comments on commit be077cd

Please sign in to comment.