Skip to content

Commit fb384a1

Browse files
BlueDrink9BlueDrink9
authored
Merge branch 'main' into main
2 parents 5f7b339 + dfaff22 commit fb384a1

1,074 files changed

Lines changed: 26598 additions & 8165 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎.github/actions/lint-lua-ls/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ description: "Lints all lua files with lua-language-server"
33
runs:
44
using: "composite"
55
steps:
6-
- uses: cachix/install-nix-action@v27
6+
- uses: cachix/install-nix-action@v31
77
with:
88
nix_path: nixpkgs=channel:nixos-unstable
99
- uses: DeterminateSystems/magic-nix-cache-action@v2

‎.github/actions/test-neovim-lua/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ description: "Set up Neovim Lua environment and run Busted tests"
33
runs:
44
using: "composite"
55
steps:
6-
- uses: leafo/gh-actions-lua@v10
6+
- uses: leafo/gh-actions-lua@v11
77
with:
88
luaVersion: "luajit-openresty"
9-
- uses: leafo/gh-actions-luarocks@v4
9+
- uses: leafo/gh-actions-luarocks@v5
1010
- shell: bash
1111
run: |
1212
luarocks install busted

‎.github/workflows/deploy.yaml‎

Lines changed: 55 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,43 @@ jobs:
1313
environment: production
1414
env:
1515
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
16+
1617
steps:
17-
- uses: actions/checkout@v4
18+
- name: Checkout repository
19+
uses: actions/checkout@v4
1820
with:
21+
# This is needed to get the number of commits in the current branch
1922
fetch-depth: 0
20-
- run: corepack enable
21-
- uses: actions/setup-node@v4
23+
24+
- name: Install pnpm
25+
uses: pnpm/action-setup@v4
26+
27+
- name: Set up Node.js
28+
uses: actions/setup-node@v4
2229
with:
2330
node-version-file: .nvmrc
2431
cache: pnpm
25-
- run: pnpm --color install
26-
- run: pnpm --color compile
27-
- run: pnpm --color --filter '!cursorless-org' --filter '!cursorless-org-*' build
32+
33+
- name: Install dependencies
34+
run: pnpm --color install
35+
36+
- name: Compile
37+
run: pnpm --color compile
38+
39+
- name: Build
40+
run: pnpm --color --filter '!cursorless-org' --filter '!cursorless-org-*' build
2841
env:
2942
CURSORLESS_DEPLOY: true
43+
3044
- name: Publish to Open VSX Registry
3145
id: publishToOpenVSX
32-
uses: HaaLeo/publish-vscode-extension@v1
46+
uses: HaaLeo/publish-vscode-extension@v2
3347
with:
3448
pat: ${{ secrets.OPEN_VSX_TOKEN }}
3549
packagePath: packages/cursorless-vscode/dist
50+
3651
- name: Publish to Visual Studio Marketplace
37-
uses: HaaLeo/publish-vscode-extension@v1
52+
uses: HaaLeo/publish-vscode-extension@v2
3853
with:
3954
pat: ${{ secrets.VS_MARKETPLACE_TOKEN }}
4055
registryUrl: https://marketplace.visualstudio.com
@@ -47,36 +62,53 @@ jobs:
4762
env:
4863
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
4964
STAGING_DIRECTORY: ${{ github.workspace }}/cursorless.nvim-staging
65+
5066
steps:
51-
- uses: actions/checkout@v4
52-
- run: corepack enable
53-
- uses: actions/setup-node@v4
67+
- name: Checkout repository
68+
uses: actions/checkout@v4
69+
70+
- name: Install pnpm
71+
uses: pnpm/action-setup@v4
72+
73+
- name: Set up Node.js
74+
uses: actions/setup-node@v4
5475
with:
5576
node-version-file: .nvmrc
5677
cache: pnpm
57-
- run: pnpm --color install
58-
- run: pnpm --color compile
59-
- run: pnpm --color --filter '!cursorless-org' --filter '!cursorless-org-*' build
78+
79+
- name: Install dependencies
80+
run: pnpm --color install
81+
82+
- name: Compile
83+
run: pnpm --color compile
84+
85+
- name: Build
86+
run: pnpm --color --filter '!cursorless-org' --filter '!cursorless-org-*' build
6087
env:
6188
CURSORLESS_DEPLOY: true
62-
- uses: actions/checkout@v4
89+
90+
- name: Checkout cursorless.nvim plugin repo
91+
uses: actions/checkout@v4
6392
with:
6493
token: ${{ secrets.CURSORLESS_BOT_TOKEN }}
6594
repository: hands-free-vim/cursorless.nvim
6695
path: ${{ env.STAGING_DIRECTORY }}
96+
6797
- name: Configure GPG Key
6898
working-directory: ${{ env.STAGING_DIRECTORY }}
6999
run: |
70100
echo -n "$GPG_SIGNING_KEY" | base64 --decode | gpg --import
71101
env:
72102
GPG_SIGNING_KEY: ${{ secrets.CURSORLESS_BOT_GPG_SIGNING_KEY }}
103+
73104
- name: git config
74105
working-directory: ${{ env.STAGING_DIRECTORY }}
75106
run: |
76107
git config user.name cursorless-bot
77108
git config user.email 98099035+cursorless-bot@users.noreply.github.com
78109
git config user.signingkey A9387720AFC62221
79110
git config commit.gpgsign true
111+
80112
- name: Push compiled files to cursorless.nvim plugin repo
81113
run: bash -x scripts/deploy-cursorless-nvim.sh ${{ env.STAGING_DIRECTORY }}
82114

@@ -85,20 +117,26 @@ jobs:
85117
runs-on: ubuntu-latest
86118
needs: publish-extension
87119
environment: production
120+
88121
steps:
89-
- uses: actions/checkout@v4
122+
- name: Checkout repository
123+
uses: actions/checkout@v4
90124
with:
91125
fetch-depth: 0
92126
token: ${{ secrets.CURSORLESS_BOT_TOKEN }}
127+
93128
- name: Configure GPG Key
94129
run: |
95130
echo -n "$GPG_SIGNING_KEY" | base64 --decode | gpg --import
96131
env:
97132
GPG_SIGNING_KEY: ${{ secrets.CURSORLESS_BOT_GPG_SIGNING_KEY }}
133+
98134
- name: git config
99135
run: |
100136
git config user.name cursorless-bot
101137
git config user.email 98099035+cursorless-bot@users.noreply.github.com
102138
git config user.signingkey A9387720AFC62221
103139
git config commit.gpgsign true
104-
- run: bash -x scripts/deploy-cursorless-talon.sh
140+
141+
- name: Push cursorless-talon subrepo
142+
run: bash -x scripts/deploy-cursorless-talon.sh

‎.github/workflows/forbid-todo.yml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ on:
99
jobs:
1010
forbid-todo:
1111
runs-on: ubuntu-latest
12+
1213
steps:
13-
- uses: actions/checkout@v4
14+
- name: Checkout repository
15+
uses: actions/checkout@v4
16+
1417
- name: Forbid TODO
1518
run: ./scripts/forbid-todo.sh

‎.github/workflows/pre-commit.yml‎

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
name: Pre-commit
22
permissions: read-all
3+
34
on:
45
push:
56
branches:
@@ -16,19 +17,37 @@ jobs:
1617
runs-on: ubuntu-latest
1718
env:
1819
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
20+
1921
steps:
20-
- uses: actions/checkout@v4
21-
- uses: actions/setup-python@v5
22+
- name: Checkout repository
23+
uses: actions/checkout@v4
24+
25+
- name: Setup python
26+
uses: actions/setup-python@v5
2227
with:
2328
python-version: 3.x
24-
- run: corepack enable
25-
- uses: actions/setup-node@v4
29+
30+
- name: Install pnpm
31+
uses: pnpm/action-setup@v4
32+
33+
- name: Set up Node.js
34+
uses: actions/setup-node@v4
2635
with:
2736
node-version-file: .nvmrc
2837
cache: pnpm
29-
- run: pnpm --color install
30-
- uses: leafo/gh-actions-lua@v9
31-
- uses: leafo/gh-actions-luarocks@v4
32-
- uses: pre-commit/action@v3.0.1
33-
- uses: pre-commit-ci/lite-action@v1.0.2
38+
39+
- name: Install dependencies
40+
run: pnpm --color install
41+
42+
- name: Install lua
43+
uses: leafo/gh-actions-lua@v11
44+
45+
- name: Install luarocks
46+
uses: leafo/gh-actions-luarocks@v5
47+
48+
- name: Run pre-commit hooks
49+
uses: pre-commit/action@v3.0.1
50+
51+
- name: Auto-fix pre-commit issues
52+
uses: pre-commit-ci/lite-action@v1.0.2
3453
if: always()

‎.github/workflows/test-docs.yml‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,19 @@ jobs:
1111
runs-on: ubuntu-latest
1212
env:
1313
CURSORLESS_REPO_ROOT: ${{ github.workspace }}
14+
1415
steps:
15-
- uses: actions/checkout@v4
16-
- run: corepack enable
17-
- uses: actions/setup-node@v4
16+
- name: Checkout repository
17+
uses: actions/checkout@v4
18+
19+
- name: Install pnpm
20+
uses: pnpm/action-setup@v4
21+
22+
- name: Set up Node.js
23+
uses: actions/setup-node@v4
1824
with:
1925
node-version-file: .nvmrc
2026
cache: pnpm
21-
- run: bash -x scripts/build-and-assemble-website.sh
27+
28+
- name: Build website
29+
run: bash -x scripts/build-and-assemble-website.sh

0 commit comments

Comments
 (0)