|
1 | 1 |
|
2 | | -EPOCH_TEST_COMMIT := 78e6667ae2d67aad100b28ee9580b41b7a24e667 |
3 | | -OUTPUT_DIRNAME ?= output |
4 | | -DOC_FILENAME ?= oci-runtime-spec |
5 | | -DOCKER ?= $(shell command -v docker 2>/dev/null) |
6 | | -PANDOC ?= $(shell command -v pandoc 2>/dev/null) |
| 2 | +EPOCH_TEST_COMMIT := 78e6667ae2d67aad100b28ee9580b41b7a24e667 |
| 3 | +OUTPUT_DIRNAME ?= output |
| 4 | +DOC_FILENAME ?= oci-runtime-spec |
| 5 | +DOCKER ?= $(shell command -v docker 2>/dev/null) |
| 6 | +PANDOC ?= $(shell command -v pandoc 2>/dev/null) |
| 7 | +PANDOC_IMAGE ?= ghcr.io/opencontainers/pandoc:2.9.2.1-9.fc34.x86_64@sha256:590c5c7aaa6e8e7a4debae7e9102c837daa0c8a76f8f5b5c9831ea5f755e3e95 |
7 | 8 | ifeq "$(strip $(PANDOC))" '' |
8 | 9 | ifneq "$(strip $(DOCKER))" '' |
9 | 10 | PANDOC = $(DOCKER) run \ |
10 | 11 | --security-opt label=disable \ |
11 | | - -it \ |
12 | 12 | --rm \ |
13 | 13 | -v $(shell pwd)/:/input/:ro \ |
14 | 14 | -v $(shell pwd)/$(OUTPUT_DIRNAME)/:/$(OUTPUT_DIRNAME)/ \ |
15 | 15 | -u $(shell id -u) \ |
16 | | - vbatts/pandoc |
| 16 | + $(PANDOC_IMAGE) |
17 | 17 | PANDOC_SRC := /input/ |
18 | 18 | PANDOC_DST := / |
19 | 19 | endif |
@@ -69,11 +69,11 @@ ifeq ($(call ALLOWED_GO_VERSION,1.7,$(HOST_GOLANG_VERSION)),true) |
69 | 69 | endif |
70 | 70 |
|
71 | 71 |
|
72 | | -# When this is running in travis, it will only check the travis commit range |
| 72 | +# When this is running in GitHub, it will only check the GitHub commit range |
73 | 73 | .gitvalidation: |
74 | 74 | @which git-validation > /dev/null 2>/dev/null || (echo "ERROR: git-validation not found. Consider 'make install.tools' target" && false) |
75 | | -ifdef TRAVIS_COMMIT_RANGE |
76 | | - git-validation -q -run short-subject,dangling-whitespace |
| 75 | +ifdef GITHUB_SHA |
| 76 | + git-validation -q -run DCO,short-subject,dangling-whitespace -range $(GITHUB_SHA)..HEAD |
77 | 77 | else |
78 | 78 | git-validation -v -run DCO,short-subject,dangling-whitespace -range $(EPOCH_TEST_COMMIT)..HEAD |
79 | 79 | endif |
|
0 commit comments