From e21980230591e7e6096d36c6e4820a7657909e39 Mon Sep 17 00:00:00 2001
From: tobspr <tobias.springer1@gmail.com>
Date: Thu, 28 May 2020 09:37:57 +0200
Subject: [PATCH] Update github actions

---
 .eslintrc.yml            | 40 +++++++++++------------
 .github/workflows/ci.yml | 69 ++++++++++++++++++++--------------------
 .prettierrc.yaml         |  2 +-
 package.json             |  1 +
 4 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/.eslintrc.yml b/.eslintrc.yml
index 8fd0b51b..70a53fa0 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -1,25 +1,25 @@
 env:
-  browser: true
-  es6: true
+    browser: true
+    es6: true
 extends:
-  - 'eslint:recommended'
-  - 'plugin:@typescript-eslint/eslint-recommended'
-  - 'prettier'
+    - "eslint:recommended"
+    - "plugin:@typescript-eslint/eslint-recommended"
+    - "prettier"
 globals:
-  Atomics: readonly
-  SharedArrayBuffer: readonly
-parser: '@typescript-eslint/parser'
+    Atomics: readonly
+    SharedArrayBuffer: readonly
+parser: "@typescript-eslint/parser"
 parserOptions:
-  ecmaVersion: 6
-  sourceType: 'module'
-  ecmaFeatures: 
-    - modules: true
+    ecmaVersion: 6
+    sourceType: "module"
+    ecmaFeatures:
+        - modules: true
 plugins:
-  - '@typescript-eslint'
-  - 'prettier'
-rules: 
-  prettier/prettier: error
-  no-undef: off
-  no-unused-vars: off
-  no-prototype-builtins: off
-
+    - "@typescript-eslint"
+    - "prettier"
+rules:
+    prettier/prettier: error
+    no-undef: off
+    no-unused-vars: off
+    no-prototype-builtins: off
+    linebreak-style: off
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3b8e4a08..e4dffdc7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,42 +1,41 @@
 name: CI
-    
+
 on:
-  push:
-    branches: 
-      - master  
-      - ModdedGamers-GH-Actions      
-  pull_request:  
-    branches: 
-      - master
+    push:
+        branches:
+            - master
+            - ModdedGamers-GH-Actions
+    pull_request:
+        branches:
+            - master
 
 jobs:
-  setup:
-  
-    name: CI
+    setup:
+        name: CI
 
-    runs-on: ubuntu-latest
+        runs-on: ubuntu-latest
 
-    steps:  
-    - name: Install Dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install ffmpeg
-  
-    - name: Setup Node 
-      uses: actions/setup-node@v2-beta  
-      with:
-        node-version: 10.x
- 
-    - name: Checkout repo 
-      uses: actions/checkout@v2
-  
-    - name: Install Yarn Dependencies   
-      run: |    
-        yarn
-        cd gulp/
-        yarn
-        cd ..
+        steps:
+            - name: Install Dependencies
+              run: |
+                  sudo apt-get update
+                  sudo apt-get install ffmpeg
 
-    - name: Lint
-      run: |
-        npx eslint src/js
+            - name: Setup Node
+              uses: actions/setup-node@v2-beta
+              with:
+                  node-version: 10.x
+
+            - name: Checkout repo
+              uses: actions/checkout@v2
+
+            - name: Install Yarn Dependencies
+              run: |
+                  yarn
+                  cd gulp/
+                  yarn
+                  cd ..
+
+            - name: Lint
+              run: |
+                  yarn lint
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
index 643afe72..0b5b2dba 100644
--- a/.prettierrc.yaml
+++ b/.prettierrc.yaml
@@ -8,4 +8,4 @@ useTabs: false
 quoteProps: "consistent"
 bracketSpacing: true
 arrowParens: avoid
-endOfLine: "lf"
+endOfLine: auto
diff --git a/package.json b/package.json
index 10584493..a4b7fcd1 100644
--- a/package.json
+++ b/package.json
@@ -9,6 +9,7 @@
     "scripts": {
         "dev": "./gulp/gulp main.serveDev",
         "tslint": "cd src/js && tsc",
+        "lint": "npx eslint src/js",
         "prettier-all": "prettier --write src/**/*.* && prettier --write gulp/**/*.*",
         "publishOnItch": "butler push tmp_standalone_files/shapez.io-standalone-win32-x64 tobspr/shapezio:windows --userversion-file version"
     },