iamthefij
/
drone-pre-commit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove tests script and replace by testing with personal image
continuous-integration/drone/push Build is passing Details

This commit is contained in:
IamTheFij 2021-02-05 12:33:29 -08:00
parent 93e6f791b8
commit 47ae0f8a44
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile
View File

@ -1,4 +1,5 @@
DOCKER_TAG = drone-pre-commit-$(USER) DOCKER_TAG = drone-pre-commit-$(USER)
DOCKER_TAG_PERSONAL = $(DOCKER_TAG):personal
.PHONY: clean .PHONY: clean
@ -6,8 +7,8 @@ DOCKER_TAG = drone-pre-commit-$(USER)
default: test default: test
.PHONY: test .PHONY: test
test: build test: build-personal
docker run --rm -v $(shell pwd):/src:ro --workdir /src $(DOCKER_TAG) ./tests/steps.sh docker run --rm -v $(shell pwd):/src:ro --workdir /src $(DOCKER_TAG_PERSONAL)
.PHONY: build .PHONY: build
build: ./Dockerfile build: ./Dockerfile
@ -19,7 +20,7 @@ build-personal: build ./Dockerfile.personal
docker build \ docker build \
--build-arg "BASE_IMAGE=$(DOCKER_TAG)" \ --build-arg "BASE_IMAGE=$(DOCKER_TAG)" \
-f ./Dockerfile.personal \ -f ./Dockerfile.personal \
-t "$(DOCKER_TAG):personal" \ -t "$(DOCKER_TAG_PERSONAL)" \
. .
.PHONY: install-hooks .PHONY: install-hooks
@ -31,4 +32,4 @@ check:
pre-commit run --all-files pre-commit run --all-files
.PHONY: all .PHONY: all
all: check test build build-personal all: check test

9
tests/steps.sh
View File

@ -1,9 +0,0 @@
#! /bin/bash
set -ex
# These simulate commands added to a pipeline step
wget -L -O /usr/bin/hadolint https://github.com/hadolint/hadolint/releases/download/v1.18.0/hadolint-Linux-x86_64
chmod +x /usr/bin/hadolint
pre-commit run --all-files