Skip to content

Commit fa86382

Browse files
authored
[1.10.0] Update node version, and change base image of markdownlint, update GOPROXY for docker file (#182) (#234)
* Cherry pick #182 Signed-off-by: Lubron Zhan <[email protected]> * Update GOPROXY for dockerfile Signed-off-by: Lubron Zhan <[email protected]> --------- Signed-off-by: Lubron Zhan <[email protected]>
1 parent 53caa07 commit fa86382

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

.github/workflows/actions.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ jobs:
2626
run: cd hack/tools && make golangci-lint
2727

2828
- name: Install npm
29-
uses: actions/setup-node@v2
29+
uses: actions/setup-node@v4
3030
with:
31-
node-version: '14'
31+
node-version: '20'
3232

3333
- name: Install markdown-lint tool
3434
run: npm install -g markdownlint-cli

.github/workflows/push.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ jobs:
2121
run: cd hack/tools && make golangci-lint
2222

2323
- name: Install npm
24-
uses: actions/setup-node@v2
24+
uses: actions/setup-node@v4
2525
with:
26-
node-version: '14'
26+
node-version: '20'
2727

2828
- name: Install markdown-lint tool
2929
run: npm install -g markdownlint-cli

Dockerfile-for-github-ci

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ WORKDIR /workspace
1111
COPY go.mod go.mod
1212
COPY go.sum go.sum
1313

14-
ENV GOPROXY=direct
14+
ENV GOPROXY=https://proxy.golang.org,direct
1515
RUN go mod download
1616

1717
# Copy the go source

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ lint-markdown: ## Lint the project's markdown
189189
ifdef GITHUB_ACTIONS
190190
markdownlint -c md-config.json .
191191
else
192-
docker run -i --rm -v "$$(pwd)":/work $(CACHE_IMAGE_REGISTRY)/tmknom/markdownlint -c /work/md-config.json .
192+
docker run -i --rm -v "$$(pwd)":/work ghcr.io/tmknom/dockerfiles/markdownlint -c /work/md-config.json .
193193
endif
194194

195195
.PHONY: lint-shell

0 commit comments

Comments
 (0)