From 398b638799a720f76296a643fc9f1cdd96aa9cf5 Mon Sep 17 00:00:00 2001 From: nullchilly Date: Thu, 14 Jul 2022 23:14:34 +0700 Subject: [PATCH 1/5] ci(github): Add stylua check --- .github/workflows/formatting.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/formatting.yml diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml new file mode 100644 index 0000000..f0c3310 --- /dev/null +++ b/.github/workflows/formatting.yml @@ -0,0 +1,17 @@ +name: stylua +on: + push: + branches: + - dev + paths-ignore: + - ".github/**" + +jobs: + stylua: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: JohnnyMorganz/stylua-action@1.0.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + args: --check --config-path=stylua.toml . From ebc5035e8dcaeb3ff1124444abef5c7e9fc24e74 Mon Sep 17 00:00:00 2001 From: nullchilly Date: Thu, 14 Jul 2022 23:16:20 +0700 Subject: [PATCH 2/5] ci(github): Add stylua check for main branch --- .github/workflows/formatting.yml | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index f0c3310..b37562e 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -1,17 +1,16 @@ name: stylua on: - push: - branches: - - dev - paths-ignore: - - ".github/**" + push: + branches: ["main", "dev"] + paths-ignore: + - ".github/**" jobs: - stylua: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: JohnnyMorganz/stylua-action@1.0.0 - with: - token: ${{ secrets.GITHUB_TOKEN }} - args: --check --config-path=stylua.toml . + stylua: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - uses: JohnnyMorganz/stylua-action@1.0.0 + with: + token: ${{ secrets.GITHUB_TOKEN }} + args: --check --config-path=stylua.toml . From 6fd7d6e437d7109ea0f510f0ad26cb9474c68daf Mon Sep 17 00:00:00 2001 From: nullchilly Date: Thu, 14 Jul 2022 23:19:17 +0700 Subject: [PATCH 3/5] ci(github): Test --- .../core/integrations/telescope.lua | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lua/catppuccin/core/integrations/telescope.lua b/lua/catppuccin/core/integrations/telescope.lua index 12ffd6c..66317af 100644 --- a/lua/catppuccin/core/integrations/telescope.lua +++ b/lua/catppuccin/core/integrations/telescope.lua @@ -7,16 +7,16 @@ function M.get(cp) TelescopeSelection = { fg = cp.text, bg = cp.surface0, style = "bold" }, TelescopeMatching = { fg = cp.blue }, -- Allow Telescope to hijack these highlights in order to achieve the old behavior - -- TelescopePromptPrefix = { bg = cp.crust }, - -- TelescopePromptNormal = { bg = cp.crust}, - -- TelescopeResultsNormal = { bg = cp.mantle}, - -- TelescopePreviewNormal = { bg = cp.crust }, - -- TelescopePromptBorder = { bg = cp.crust, fg = cp.crust }, - -- TelescopeResultsBorder = { bg = cp.mantle, fg = cp.crust }, - -- TelescopePreviewBorder = { bg = cp.crust, fg = cp.crust }, - -- TelescopePromptTitle = { fg = cp.crust }, - -- TelescopeResultsTitle = { fg = cp.text }, - -- TelescopePreviewTitle = { fg = cp.crust }, + -- TelescopePromptPrefix = { bg = cp.crust }, + -- TelescopePromptNormal = { bg = cp.crust}, + -- TelescopeResultsNormal = { bg = cp.mantle}, + -- TelescopePreviewNormal = { bg = cp.crust }, + -- TelescopePromptBorder = { bg = cp.crust, fg = cp.crust }, + -- TelescopeResultsBorder = { bg = cp.mantle, fg = cp.crust }, + -- TelescopePreviewBorder = { bg = cp.crust, fg = cp.crust }, + -- TelescopePromptTitle = { fg = cp.crust }, + -- TelescopeResultsTitle = { fg = cp.text }, + -- TelescopePreviewTitle = { fg = cp.crust }, } end From a8935c4118b13365afa3ac92691571f16adbf1ee Mon Sep 17 00:00:00 2001 From: nullchilly Date: Thu, 14 Jul 2022 23:30:51 +0700 Subject: [PATCH 4/5] ci(github): Add pull request check --- .github/workflows/formatting.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/formatting.yml b/.github/workflows/formatting.yml index b37562e..fdf810a 100644 --- a/.github/workflows/formatting.yml +++ b/.github/workflows/formatting.yml @@ -1,9 +1,12 @@ name: stylua on: push: - branches: ["main", "dev"] - paths-ignore: - - ".github/**" + name: stylua + on: + push: + branches: ["main", "dev"] + pull_request: + branches: ["main", "dev"] jobs: stylua: From 408fdbf98ec90ec2c43f0bf218acb3b5e7f17b92 Mon Sep 17 00:00:00 2001 From: nullchilly Date: Fri, 15 Jul 2022 00:15:09 +0700 Subject: [PATCH 5/5] ci(github): Revert test --- .../core/integrations/telescope.lua | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lua/catppuccin/core/integrations/telescope.lua b/lua/catppuccin/core/integrations/telescope.lua index 66317af..12ffd6c 100644 --- a/lua/catppuccin/core/integrations/telescope.lua +++ b/lua/catppuccin/core/integrations/telescope.lua @@ -7,16 +7,16 @@ function M.get(cp) TelescopeSelection = { fg = cp.text, bg = cp.surface0, style = "bold" }, TelescopeMatching = { fg = cp.blue }, -- Allow Telescope to hijack these highlights in order to achieve the old behavior - -- TelescopePromptPrefix = { bg = cp.crust }, - -- TelescopePromptNormal = { bg = cp.crust}, - -- TelescopeResultsNormal = { bg = cp.mantle}, - -- TelescopePreviewNormal = { bg = cp.crust }, - -- TelescopePromptBorder = { bg = cp.crust, fg = cp.crust }, - -- TelescopeResultsBorder = { bg = cp.mantle, fg = cp.crust }, - -- TelescopePreviewBorder = { bg = cp.crust, fg = cp.crust }, - -- TelescopePromptTitle = { fg = cp.crust }, - -- TelescopeResultsTitle = { fg = cp.text }, - -- TelescopePreviewTitle = { fg = cp.crust }, + -- TelescopePromptPrefix = { bg = cp.crust }, + -- TelescopePromptNormal = { bg = cp.crust}, + -- TelescopeResultsNormal = { bg = cp.mantle}, + -- TelescopePreviewNormal = { bg = cp.crust }, + -- TelescopePromptBorder = { bg = cp.crust, fg = cp.crust }, + -- TelescopeResultsBorder = { bg = cp.mantle, fg = cp.crust }, + -- TelescopePreviewBorder = { bg = cp.crust, fg = cp.crust }, + -- TelescopePromptTitle = { fg = cp.crust }, + -- TelescopeResultsTitle = { fg = cp.text }, + -- TelescopePreviewTitle = { fg = cp.crust }, } end