Merge branch 'master' of https://github.com/project-error/new-phone-w…

…ho-dis

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: Test Suite
 
-on: [push]
+on: [push, pull_request]
 
 jobs:
   nui_preformatting_tests:
@@ -13,11 +13,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-        with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.head_ref }}
-          # This is important to fetch the changes to the previous commit
-          fetch-depth: 0
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn config get cacheFolder)"
@@ -49,11 +44,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
-        with:
-          # Make sure the actual branch is checked out when running on pull requests
-          ref: ${{ github.head_ref }}
-          # This is important to fetch the changes to the previous commit
-          fetch-depth: 0
       - name: Use Node.js
         uses: actions/setup-node@v1
         with:
@@ -64,3 +54,16 @@ jobs:
         run: yarn test
         env:
           CI: true
+
+  lint:
+    name: Lint Lua scripts
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: resources
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Lint
+        uses: GoatG33k/fivem-lua-lint-action@v1

resources/client/cl_controls.lua

@@ -41,4 +41,4 @@ end)
 
 AddEventHandler('npwd:disableControlActions', function(bool)
   disableKeys = bool
-end) 
+end)