Skip to content

Commit 9683f17

Browse files
authored
Merge branch 'zed-industries:main' into main
2 parents fe16667 + da754f9 commit 9683f17

File tree

262 files changed

+1928
-1053
lines changed

Some content is hidden

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

262 files changed

+1928
-1053
lines changed

.github/workflows/actionlint.yml

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Lint GitHub Actions workflows
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- ".github/**"
7+
push:
8+
branches:
9+
- "main"
10+
paths:
11+
- ".github/**"
12+
13+
jobs:
14+
actionlint:
15+
runs-on: ubuntu-latest
16+
env:
17+
SHA: 03d0035246f3e81f36aed592ffb4bebf33a03106
18+
VERSION: 1.7.7
19+
steps:
20+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
21+
- name: Download actionlint
22+
id: get_actionlint
23+
run: |
24+
bash <(curl "https://raw.githubusercontent.com/rhysd/actionlint/${{ env.SHA }}/scripts/download-actionlint.bash") "${{ env.VERSION }}"
25+
shell: bash
26+
- name: Check workflow files
27+
run: ${{ steps.get_actionlint.outputs.executable }} -color
28+
shell: bash

.github/workflows/ci.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ concurrency:
1111
cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
1212

1313
env:
14-
ZED_EXTENSION_CLI_SHA: f338c46bf79f773ec7a41729270227da8c2660b5
14+
ZED_EXTENSION_CLI_SHA: 332626e5825564e97afc969292c90d9b0fb40b6d
1515

1616
jobs:
1717
package:
1818
runs-on: ubuntu-latest
1919
if: github.repository_owner == 'zed-industries'
2020
steps:
2121
- name: Checkout repo
22-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
22+
uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
2323
with:
2424
clean: false
2525
fetch-depth: 0
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Cache zed-extension CLI
3737
id: cache-zed-extension
38-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
38+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
3939
with:
4040
path: |
4141
zed-extension
@@ -57,7 +57,7 @@ jobs:
5757
run: pnpm test
5858

5959
- name: Cache extension build dependencies
60-
uses: actions/cache@5a3ec84eff668545956fd18022155c47e93e2684 # v4
60+
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4
6161
with:
6262
key: cache-build-dependencies
6363
path: |
@@ -81,6 +81,7 @@ jobs:
8181
8282
- name: Enforce no Git LFS
8383
run: |
84+
# shellcheck disable=SC2016
8485
git submodule foreach --quiet \
8586
'[ ! -f .gitattributes ] || ! grep -q "filter=lfs" .gitattributes && [ ! -d .git/lfs ] || {
8687
echo "LFS detected in $path" >&2 && exit 1

.github/workflows/danger.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
runs-on: ubuntu-latest
1515
if: github.repository_owner == 'zed-industries'
1616
steps:
17-
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
17+
- uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
1818

1919
- uses: pnpm/action-setup@a7487c7e89a18df4991f7f222e4898a00d66ddda # v4
2020
with:

0 commit comments

Comments
 (0)