Skip to content

Commit ab34c73

Browse files
author
Prakash Surya
authored
Use "delphix/actions" for shellcheck and shfmt (#220)
1 parent 8076d2f commit ab34c73

File tree

3 files changed

+4
-22
lines changed

3 files changed

+4
-22
lines changed

.github/workflows/main.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,12 @@ jobs:
1111
runs-on: ubuntu-18.04
1212
steps:
1313
- uses: actions/checkout@v2
14-
- run: docker build -t delphix-platform:latest docker
15-
- run: ./scripts/docker-run.sh make shellcheck
14+
- uses: delphix/actions/shellcheck@master
1615
check-shfmt:
1716
runs-on: ubuntu-18.04
1817
steps:
1918
- uses: actions/checkout@v2
20-
- run: docker build -t delphix-platform:latest docker
21-
- run: ./scripts/docker-run.sh make shfmtcheck
19+
- uses: delphix/actions/shfmt@master
2220
check-pylint:
2321
runs-on: ubuntu-18.04
2422
steps:

Makefile

+1-11
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,7 @@ VERSION := $(shell date '+%Y.%m.%d.%H')
2424

2525
.PHONY: \
2626
check \
27-
package \
28-
shellcheck \
29-
shfmtcheck
30-
31-
check: shellcheck shfmtcheck
27+
package
3228

3329
packages: $(addprefix package-,$(ALL_PLATFORMS))
3430

@@ -47,9 +43,3 @@ package-%:
4743
done
4844

4945
@mv -v ../delphix-platform-$*_*_amd64.deb artifacts
50-
51-
shellcheck:
52-
shellcheck $$(shfmt -f .)
53-
54-
shfmtcheck:
55-
shfmt -d .

docker/Dockerfile

+1-7
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,5 @@ RUN \
3434
devscripts \
3535
dpkg-dev \
3636
jq \
37-
make \
38-
shellcheck \
39-
wget && \
37+
make && \
4038
rm -rf /var/lib/apt/lists/*
41-
42-
RUN wget -nv -O /usr/local/bin/shfmt \
43-
https://github.com/mvdan/sh/releases/download/v2.4.0/shfmt_v2.4.0_linux_amd64 && \
44-
chmod +x /usr/local/bin/shfmt

0 commit comments

Comments
 (0)