Merge pull request #521 from bitpredator/develop

chore: oxmysql update to version 2.7.5 + new extra_libs
bitpredator · Sep 18, 2023 · 1fba69d · 1fba69d
2 parents 1974ade + 15a33d2
commit 1fba69d
Show file tree

Hide file tree

Showing 6 changed files with 190 additions and 356 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -11,7 +11,7 @@ jobs:
         with:
           capture: "junit.xml"
           args: "-t --formatter JUnit"
-          extra_libs: mysql
+          extra_libs: mysql+ox_lib
       - name: Generate Lint Report
         if: always()
         uses: mikepenz/action-junit-report@v4

diff --git a/server-data/resources/[ox]/oxmysql/README.md b/server-data/resources/[ox]/oxmysql/README.md
@@ -31,6 +31,4 @@ https://www.npmjs.com/package/@overextended/oxmysql
 ## Lua Language Server
 
 - Install [Lua Language Server](https://marketplace.visualstudio.com/items?itemName=sumneko.lua) to ease development with annotations, type checking, diagnostics, and more.
-- Install [cfxlua-vscode](https://marketplace.visualstudio.com/items?itemName=overextended.cfxlua-vscode) to add natives and cfxlua runtime declarations to LLS.
-- You can load oxmysql into your global development environment by modifying workspace/user settings "Lua.workspace.library" with the resource path.
-  - e.g. "c:\\fxserver\\resources\\oxmysql\\lib\\define.lua"
+- See [ox_types](https://github.com/overextended/ox_types) for our Lua type definitions.