From 9863c86945d3d2c9667b176f8922b9439caab79b Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 18 Aug 2025 22:06:19 +0200 Subject: [PATCH 1/9] ci(integration-table): simplify workflow filter --- .github/workflows/integration-table.yml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-table.yml b/.github/workflows/integration-table.yml index c015a971..6aebc8ff 100644 --- a/.github/workflows/integration-table.yml +++ b/.github/workflows/integration-table.yml @@ -1,12 +1,10 @@ name: Generate Integration Table on: - workflow_dispatch: pull_request: - paths: - - 'lua/catppuccin/groups/integrations/**.lua' - branches-ignore: - - 'release-please*' + push: + paths-ignore: + - "*.md" jobs: docs: From ef6ce3fb70b7be479c45709bbe154e832408733c Mon Sep 17 00:00:00 2001 From: robin Date: Mon, 18 Aug 2025 22:17:44 +0200 Subject: [PATCH 2/9] refactor: merge pandocvim and integration-table --- .github/workflows/integration-table.yml | 30 --------------- .github/workflows/pandocvim.yml | 26 ------------- .github/workflows/patch.yml | 50 +++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 56 deletions(-) delete mode 100644 .github/workflows/integration-table.yml delete mode 100644 .github/workflows/pandocvim.yml create mode 100644 .github/workflows/patch.yml diff --git a/.github/workflows/integration-table.yml b/.github/workflows/integration-table.yml deleted file mode 100644 index 6aebc8ff..00000000 --- a/.github/workflows/integration-table.yml +++ /dev/null @@ -1,30 +0,0 @@ -name: Generate Integration Table - -on: - pull_request: - push: - paths-ignore: - - "*.md" - -jobs: - docs: - name: Update integration table - runs-on: ubuntu-latest - permissions: - contents: write - - steps: - - uses: actions/checkout@v5 - with: - ref: ${{ github.ref }} - - name: Install Neovim - uses: MunifTanjim/setup-neovim-action@v1 - with: - tag: nightly - - name: Update integration table - run: | - nvim -l scripts/generate_integration_mappings_table.lua - - uses: stefanzweifel/git-auto-commit-action@v6 - with: - commit_message: "chore: auto generate integration table" - branch: ${{ github.ref }} diff --git a/.github/workflows/pandocvim.yml b/.github/workflows/pandocvim.yml deleted file mode 100644 index e0fd2bc5..00000000 --- a/.github/workflows/pandocvim.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: panvimdoc - -on: - push: - paths: - - '**.md' - -jobs: - docs: - runs-on: ubuntu-latest - name: pandoc to vimdoc - steps: - - uses: actions/checkout@v5 - - name: panvimdoc - uses: kdheepak/panvimdoc@main - with: - vimdoc: catppuccin - description: "Soothing pastel theme for NeoVim" - pandoc: "README.md" - toc: true - version: "nvim >= 0.8.0" - treesitter: true - - uses: stefanzweifel/git-auto-commit-action@v6 - with: - commit_message: "docs: auto generate vimdoc" - branch: ${{ github.head_ref }} diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml new file mode 100644 index 00000000..b39e9e04 --- /dev/null +++ b/.github/workflows/patch.yml @@ -0,0 +1,50 @@ +name: Patch +on: + pull_request: + push: + branches: + - main + +jobs: + integration-table-gen: + name: update integration table + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v5 + with: + ref: ${{ github.ref }} + - name: Install Neovim + uses: MunifTanjim/setup-neovim-action@v1 + - name: Update integration table + run: | + nvim -l scripts/generate_integration_mappings_table.lua + - uses: stefanzweifel/git-auto-commit-action@v6 + with: + commit_message: "chore: auto generate integration table" + branch: ${{ github.ref }} + docs: + name: generate vimdoc + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v5 + with: + ref: ${{ github.ref }} + - name: panvimdoc + uses: kdheepak/panvimdoc@main + with: + vimdoc: catppuccin + description: "Soothing pastel theme for NeoVim" + pandoc: "README.md" + toc: true + version: "nvim >= 0.8.0" + treesitter: true + - uses: stefanzweifel/git-auto-commit-action@v6 + with: + commit_message: "docs: auto generate vimdoc" + branch: ${{ github.ref }} From 53eefd513492c604d6f1eed09b513bc3d32cfb66 Mon Sep 17 00:00:00 2001 From: Hammy <58985301+sgoudham@users.noreply.github.com> Date: Tue, 19 Aug 2025 22:36:49 +0100 Subject: [PATCH 3/9] ci: don't run on push --- .github/workflows/patch.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index b39e9e04..2f4895b3 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -1,7 +1,6 @@ name: Patch on: pull_request: - push: branches: - main From 464ba8ea95727355d27a6f29c29668ebc3cfad8b Mon Sep 17 00:00:00 2001 From: Hammy <58985301+sgoudham@users.noreply.github.com> Date: Tue, 19 Aug 2025 22:38:25 +0100 Subject: [PATCH 4/9] ci: add workflow_dispatch --- .github/workflows/patch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 2f4895b3..c96b6bb0 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -1,5 +1,6 @@ name: Patch on: + workflow_dispatch: pull_request: branches: - main From f74be122fef54a751a3678af92cc2bb90342b243 Mon Sep 17 00:00:00 2001 From: Hammy <58985301+sgoudham@users.noreply.github.com> Date: Tue, 19 Aug 2025 22:40:39 +0100 Subject: [PATCH 5/9] chore: fix whitespace --- .github/workflows/patch.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index c96b6bb0..de8a01c6 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -1,6 +1,6 @@ name: Patch on: - workflow_dispatch: + workflow_dispatch: pull_request: branches: - main From f0723fbb6695edf260167e5d69396c2d2b389ca6 Mon Sep 17 00:00:00 2001 From: robin Date: Sat, 25 Oct 2025 15:22:21 +0200 Subject: [PATCH 6/9] fix: workflow triggers --- .github/workflows/patch.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index de8a01c6..d6f49687 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -1,9 +1,10 @@ name: Patch on: workflow_dispatch: + push: + branches: [main] pull_request: - branches: - - main + branches: [main] jobs: integration-table-gen: From 04f5b61f2ae82e6040a19bcb65387ddbff30c336 Mon Sep 17 00:00:00 2001 From: robin Date: Sat, 25 Oct 2025 15:22:21 +0200 Subject: [PATCH 7/9] fix: make sure integration processing happens after docs get generated --- .github/workflows/patch.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index d6f49687..842df2dc 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -8,6 +8,7 @@ on: jobs: integration-table-gen: + needs: [docs] name: update integration table runs-on: ubuntu-latest permissions: From c42ee65a38aed40135c4dc9de1b330a72ae00473 Mon Sep 17 00:00:00 2001 From: robin Date: Tue, 28 Oct 2025 13:33:54 +0100 Subject: [PATCH 8/9] fix: remove push trigger --- .github/workflows/patch.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 842df2dc..4cfa0671 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -1,8 +1,6 @@ name: Patch on: workflow_dispatch: - push: - branches: [main] pull_request: branches: [main] From bef486fd4fd45b4ba3f5e3929f8438d47a186eb2 Mon Sep 17 00:00:00 2001 From: robin Date: Tue, 28 Oct 2025 16:49:35 +0100 Subject: [PATCH 9/9] fix: move in accordance with order of execution --- .github/workflows/patch.yml | 40 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index 4cfa0671..91b1a55a 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -5,26 +5,6 @@ on: branches: [main] jobs: - integration-table-gen: - needs: [docs] - name: update integration table - runs-on: ubuntu-latest - permissions: - contents: write - - steps: - - uses: actions/checkout@v5 - with: - ref: ${{ github.ref }} - - name: Install Neovim - uses: MunifTanjim/setup-neovim-action@v1 - - name: Update integration table - run: | - nvim -l scripts/generate_integration_mappings_table.lua - - uses: stefanzweifel/git-auto-commit-action@v6 - with: - commit_message: "chore: auto generate integration table" - branch: ${{ github.ref }} docs: name: generate vimdoc runs-on: ubuntu-latest @@ -48,3 +28,23 @@ jobs: with: commit_message: "docs: auto generate vimdoc" branch: ${{ github.ref }} + integration-table-gen: + needs: [docs] + name: update integration table + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - uses: actions/checkout@v5 + with: + ref: ${{ github.ref }} + - name: Install Neovim + uses: MunifTanjim/setup-neovim-action@v1 + - name: Update integration table + run: | + nvim -l scripts/generate_integration_mappings_table.lua + - uses: stefanzweifel/git-auto-commit-action@v6 + with: + commit_message: "chore: auto generate integration table" + branch: ${{ github.ref }}