From 4de1e2040a50d0f23acbc05849a0e1326db9bcd2 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Sat, 29 Jul 2023 16:10:07 +0200 Subject: [PATCH] :wrench: Update workflows, add styluaignore file, update fxmanifest version --- .github/workflows/format-all.yml | 12 +++++++ .styluaignore | 1 + fxmanifest.lua | 62 ++++++++++++++++---------------- 3 files changed, 44 insertions(+), 31 deletions(-) create mode 100644 .styluaignore diff --git a/.github/workflows/format-all.yml b/.github/workflows/format-all.yml index b94e134..6a3abcb 100644 --- a/.github/workflows/format-all.yml +++ b/.github/workflows/format-all.yml @@ -23,13 +23,25 @@ jobs: - uses: actions/setup-node@v3 with: node-version: "16" + - name: Check exist lua files + id: check_lua_files + uses: andstor/file-existence-action@v2 + with: + files: "*.lua" - name: Install stylua and format files + if: steps.check_lua_files.outputs.files_exists == 'true' uses: JohnnyMorganz/stylua-action@v3 with: token: ${{ secrets.GITHUB_TOKEN }} version: v0.18.0 args: -- . + - name: Check exist web files + id: check_web_files + uses: andstor/file-existence-action@v2 + with: + files: "**/*.{ts,js,css,html}" - name: Format files with Prettier + if: steps.check_web_files.outputs.files_exists == 'true' run: | npx prettier --write '**/*.{ts,js,css,html}' - name: Update repo before push diff --git a/.styluaignore b/.styluaignore new file mode 100644 index 0000000..ad2a259 --- /dev/null +++ b/.styluaignore @@ -0,0 +1 @@ +fxmanifest.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index ef1d279..0be825e 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,38 +1,38 @@ -fx_version("cerulean") -game("gta5") -lua54("yes") +fx_version 'cerulean' +game 'gta5' +lua54 'yes' -description("ESX hud") -version("1.4.0") +description 'ESX hud' +version '1.5.0' -shared_scripts({ - "@es_extended/imports.lua", - "@es_extended/locale.lua", - "shared/config.lua", - "shared/main.lua", - "locales/*.lua", -}) +shared_scripts { + '@es_extended/imports.lua', + '@es_extended/locale.lua', + 'shared/config.lua', + 'shared/main.lua', + 'locales/*.lua' +} -server_scripts({ - "@oxmysql/lib/MySQL.lua", - "server/*.lua", -}) +server_scripts { + '@oxmysql/lib/MySQL.lua', + 'server/*.lua' +} -client_scripts({ - "client/*.lua", - "client/player/*.lua", - "client/vehicle/*.lua", -}) +client_scripts { + 'client/*.lua', + 'client/player/*.lua', + 'client/vehicle/*.lua' +} -ui_page("web/dist/index.html") +ui_page 'web/dist/index.html' -files({ - "web/dist/**", - "web/dist/assets/**", -}) +files { + 'web/dist/**', + 'web/dist/assets/**', +} -dependencies({ - "es_extended", - "esx_status", - "oxmysql", -}) +dependencies { + 'es_extended', + 'esx_status', + 'oxmysql' +}