fix conflicts

Author: falcucci

.editorconfig

@@ -0,0 +1,17 @@
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = space
+
+[*.rs]
+indent_size = 4
+max_line_length = 100
+
+[*.lua]
+indent_size = 4
+max_line_length = 120
+
+[*.md]
+indent_size = 2
+max_line_length = 100

.github/workflows/build.yml

@@ -75,6 +75,9 @@ jobs:
         run: cargo binstall -y cargo-nextest
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          shared-key: test-and-clippy
+          save-if: ${{ github.ref == 'refs/heads/main' }}
 
       - name: Test
         env:
@@ -112,6 +115,9 @@ jobs:
           components: clippy
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: false
+          shared-key: test-and-clippy
 
       - name: Show toolchain info
         run: cargo --version --verbose
@@ -149,6 +155,12 @@ jobs:
       - name: Install Cargo Binstall
         uses: cargo-bins/cargo-binstall@main
 
+      # This is needed for building skia from source
+      - name: Setup github long path support (Windows)
+        if: matrix.os == 'windows-latest'
+        run: |
+          git config --system core.longpaths true
+
       - name: Install dependencies (Windows)
         if: matrix.os == 'windows-latest'
         run: |
@@ -185,15 +197,14 @@ jobs:
           neovim: true
 
       - uses: Swatinem/rust-cache@v2
+        with:
+          save-if: ${{ github.ref == 'refs/heads/main' }}
 
       - name: Build (Windows)
         if: matrix.os == 'windows-latest'
         env:
           RUSTFLAGS: "-Ctarget-feature=+crt-static" 
-        # The file paths are to long, so we need to vendor the dependencies
         run: |
-          mkdir .cargo
-          cargo vendor ../c > .cargo/config.toml
           cargo wix --nocapture --output target/release/neovide.msi --package neovide
 
       - name: Build (macOS)