Skip to content

Commit c74e7f2

Browse files
committed
chore: try removing cache from fmt and lint
1 parent 9440b3d commit c74e7f2

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

.github/workflows/ci.yaml

+22-3
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,30 @@ jobs:
192192
fetch-depth: 0
193193
submodules: true
194194

195-
- uses: ./.github/actions/setup-node
196-
- uses: ./.github/actions/setup-go
195+
- uses: buildjet/setup-node@v3
196+
with:
197+
node-version: 16.16.0
198+
199+
- uses: buildjet/setup-go@v4
200+
with:
201+
# We do our own caching for implementation clarity.
202+
cache: false
203+
go-version: 1.20.5
204+
205+
- name: Install prettier
206+
run: npm install -g prettier
197207

198208
- name: Install shfmt
199-
run: go install mvdan.cc/sh/v3/cmd/shfmt@v3.5.0
209+
uses: jaxxstorm/action-install-gh-release@v1.10.0
210+
with: # Grab the latest version
211+
repo: mvdan/sh
212+
tag: v3.5.0
213+
214+
- name: Install gofumpt
215+
uses: jaxxstorm/action-install-gh-release@v1.10.0
216+
with: # Grab the latest version
217+
repo: mvdan/gofumpt
218+
tag: v0.5.0
200219

201220
- name: make fmt
202221
run: |

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ fmt: fmt/prettier fmt/terraform fmt/shfmt fmt/go
374374
fmt/go:
375375
# VS Code users should check out
376376
# https://github.com/mvdan/gofumpt#visual-studio-code
377-
go run mvdan.cc/gofumpt@v0.4.0 -w -l .
377+
gofumpt -w -l .
378378
.PHONY: fmt/go
379379

380380
fmt/prettier:

site/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"chromatic": "chromatic",
1212
"dev": "vite",
1313
"format:check": "prettier --cache --check '../**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
14-
"format:types": "prettier --write 'src/api/typesGenerated.ts'",
15-
"format:write": "prettier --write '../**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
14+
"format:types": "prettier --cache --write 'src/api/typesGenerated.ts'",
15+
"format:write": "prettier --cache --write '../**/*.{css,html,js,json,jsx,md,ts,tsx,yaml,yml}'",
1616
"format:write:only": "prettier --write",
1717
"lint": "yarn typegen && yarn run lint:types && jest --selectProjects lint",
1818
"lint:fix": "FIX=true yarn lint",

0 commit comments

Comments
 (0)