Skip to content

Use "delphix/actions" for shellcheck and shfmt #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,12 @@ jobs:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- run: docker build -t delphix-platform:latest docker
- run: ./scripts/docker-run.sh make shellcheck
- uses: delphix/actions/shellcheck@master
check-shfmt:
runs-on: ubuntu-18.04
steps:
- uses: actions/checkout@v2
- run: docker build -t delphix-platform:latest docker
- run: ./scripts/docker-run.sh make shfmtcheck
- uses: delphix/actions/shfmt@master
check-pylint:
runs-on: ubuntu-18.04
steps:
Expand Down
12 changes: 1 addition & 11 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ VERSION := $(shell date '+%Y.%m.%d.%H')

.PHONY: \
check \
package \
shellcheck \
shfmtcheck

check: shellcheck shfmtcheck
package

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

Expand All @@ -47,9 +43,3 @@ package-%:
done

@mv -v ../delphix-platform-$*_*_amd64.deb artifacts

shellcheck:
shellcheck $$(shfmt -f .)

shfmtcheck:
shfmt -d .
8 changes: 1 addition & 7 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,5 @@ RUN \
devscripts \
dpkg-dev \
jq \
make \
shellcheck \
wget && \
make && \
rm -rf /var/lib/apt/lists/*

RUN wget -nv -O /usr/local/bin/shfmt \
https://github.com/mvdan/sh/releases/download/v2.4.0/shfmt_v2.4.0_linux_amd64 && \
chmod +x /usr/local/bin/shfmt