diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index c47ca38b..99d27584 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -26,9 +26,9 @@ jobs: run: cd hack/tools && make golangci-lint - name: Install npm - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: '14' + node-version: '20' - name: Install markdown-lint tool run: npm install -g markdownlint-cli diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 2c88a6ba..f32dc884 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -21,9 +21,9 @@ jobs: run: cd hack/tools && make golangci-lint - name: Install npm - uses: actions/setup-node@v2 + uses: actions/setup-node@v4 with: - node-version: '14' + node-version: '20' - name: Install markdown-lint tool run: npm install -g markdownlint-cli diff --git a/Dockerfile-for-github-ci b/Dockerfile-for-github-ci index 79a143af..4df4739b 100644 --- a/Dockerfile-for-github-ci +++ b/Dockerfile-for-github-ci @@ -11,7 +11,7 @@ WORKDIR /workspace COPY go.mod go.mod COPY go.sum go.sum -ENV GOPROXY=direct +ENV GOPROXY=https://proxy.golang.org,direct RUN go mod download # Copy the go source diff --git a/Makefile b/Makefile index 7d57221a..23169d46 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ lint-markdown: ## Lint the project's markdown ifdef GITHUB_ACTIONS markdownlint -c md-config.json . else - docker run -i --rm -v "$$(pwd)":/work $(CACHE_IMAGE_REGISTRY)/tmknom/markdownlint -c /work/md-config.json . + docker run -i --rm -v "$$(pwd)":/work ghcr.io/tmknom/dockerfiles/markdownlint -c /work/md-config.json . endif .PHONY: lint-shell