From f2093fd593c5151aaccf0af23ae5dce6b710ecfc Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 28 Jan 2024 13:44:34 +0100 Subject: [PATCH 1/2] Update formatt-all.yml --- .github/workflows/formatt-all.yml | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/.github/workflows/formatt-all.yml b/.github/workflows/formatt-all.yml index 4cf57ed12..e38170733 100644 --- a/.github/workflows/formatt-all.yml +++ b/.github/workflows/formatt-all.yml @@ -17,9 +17,23 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} steps: - uses: actions/checkout@v4 - - uses: JohnnyMorganz/stylua-action@v3 + with: + ref: ${{ github.head_ref }} + fetch-depth: 0 + - uses: actions/setup-node@v3 + with: + node-version: "16" + - name: Install stylua and format files + uses: JohnnyMorganz/stylua-action@v3 with: token: ${{ secrets.GITHUB_TOKEN }} - version: latest # NOTE: we recommend pinning to a specific version in case of formatting changes - # CLI arguments - args: --check . \ No newline at end of file + version: v0.18.0 + args: -- . + - name: Format files with Prettier + run: | + npx prettier --write '**/*.{ts,js,css,html}' + - name: Update repo before push + run: | + git pull + - name: Commit changes and push current branch + uses: stefanzweifel/git-auto-commit-action@v4 \ No newline at end of file From cb4d16d0768402a765c505cf55716f64c1af2d52 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Sun, 28 Jan 2024 13:47:32 +0100 Subject: [PATCH 2/2] formatting code --- .../resources/[maps]/CayoTwoIslands/fxmanifest.lua | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua index eea40cefb..ba2d891c1 100644 --- a/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua +++ b/server-data/resources/[maps]/CayoTwoIslands/fxmanifest.lua @@ -1,9 +1,9 @@ -fx_version 'cerulean' -game 'gta5' +fx_version("cerulean") +game("gta5") -name 'CayoTwoIslands' -author 'TayMcKenzieNZ' -description 'Spawns Cayo Perico alongside Los Santos' +name ("CayoTwoIslands") +author ("TayMcKenzieNZ") +description("Spawns Cayo Perico alongside Los Santos") -- Server build must be on the LATEST recommended server build. You should be checking for and updating this at least once a month -- Server MUST be on gamebuild 2189 or higher for this resource to run sucessfully