From 277079ff453fcd951447110fbc745e2241e0490f Mon Sep 17 00:00:00 2001
From: LostNeophyte <lostneophyte@tuta.io>
Date: Fri, 16 Dec 2022 12:58:35 +0100
Subject: ci: enable format workflow on master (#3623)

---
 .github/workflows/format.yaml | 12 ++++++------
 lua/lvim/core/cmp.lua         |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/format.yaml b/.github/workflows/format.yaml
index 64da97e6..576b9a5e 100644
--- a/.github/workflows/format.yaml
+++ b/.github/workflows/format.yaml
@@ -3,7 +3,7 @@ name: format
 on:
   pull_request:
     branches:
-      - "rolling"
+      - "master"
     paths:
       - 'lua/**'
       - 'snapshots/**'
@@ -18,11 +18,11 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Lint with stylua
-        uses: JohnnyMorganz/stylua-action@v1
+        uses: JohnnyMorganz/stylua-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           # CLI arguments
-          version: 0.15.1
+          version: 0.15.3
           args: --check .
 
   shfmt-check:
@@ -32,13 +32,13 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Setup Go
-        uses: actions/setup-go@v2
+        uses: actions/setup-go@v3
         with:
-          go-version: "1.16"
+          go-version: "1.18"
 
       - name: Use shfmt
         run: |
-          GO111MODULE=on go get mvdan.cc/sh/v3/cmd/shfmt
+          go install mvdan.cc/sh/v3/cmd/shfmt@v3.6
 
       # https://google.github.io/styleguide/shellguide.html
       - name: Check formatting
diff --git a/lua/lvim/core/cmp.lua b/lua/lvim/core/cmp.lua
index cf92c984..142d548f 100644
--- a/lua/lvim/core/cmp.lua
+++ b/lua/lvim/core/cmp.lua
@@ -368,7 +368,7 @@ function M.setup()
       })
     end
   end
-  
+
   if lvim.builtin.cmp.on_config_done then
     lvim.builtin.cmp.on_config_done(cmp)
   end
-- 
cgit v1.2.3