This repository was archived by the owner on May 6, 2021. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +15
-12
lines changed Expand file tree Collapse file tree 2 files changed +15
-12
lines changed Original file line number Diff line number Diff line change @@ -5,24 +5,26 @@ ENV LANG=en_US.utf8
5
5
ARG USE_GO_VERSION_FROM_WEBSITE = 0
6
6
7
7
# Some packages might seem weird but they are required by the RVM installer.
8
- RUN yum --enablerepo = centosplus install -y --quiet \
8
+ RUN yum install epel -release -y && \
9
+ yum --enablerepo = centosplus --enablerepo = epel install -y \
9
10
findutils \
10
11
git \
11
- $( test - z $USE_GO_VERSION_FROM_WEBSITE && echo "golang" ) \
12
+ $( test " $USE_GO_VERSION_FROM_WEBSITE" != 1 && echo "golang" ) \
12
13
make \
13
14
procps -ng \
14
15
tar \
15
16
wget \
16
17
which \
17
18
&& yum clean all
18
19
19
- RUN test - n $USE_GO_VERSION_FROM_WEBSITE \
20
- && cd /tmp \
21
- && wget https :/ /dl . google . com /go /go1 . 10 . linux -amd64 . tar . gz \
22
- && echo "b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33 go1.10 .linux-amd64.tar.gz" > checksum \
20
+ RUN echo $USE_GO_VERSION_FROM_WEBSITE
21
+ RUN if [ [ "$USE_GO_VERSION_FROM_WEBSITE" == 1 ] ] ; then cd /tmp \
22
+ && wget https:/ /dl . google . com /go /go1 . 11.3 . linux -amd64 . tar . gz \
23
+ && echo "b5a64335f1490277b585832d1f6c7f8c6c11206cba5cd3f771dcb87b98ad1a33 go1.11.3 .linux-amd64.tar.gz" > checksum \
23
24
&& sha256sum -c checksum \
24
- && tar -C /usr /local -xzf go1 . 10 . linux -amd64 . tar . gz \
25
- && rm -f go1 . 10 . linux -amd64 . tar . gz
25
+ && tar -C /usr /local -xzf go1 . 11.3 . linux -amd64 . tar . gz \
26
+ && rm -f go1 . 11.3 . linux -amd64 . tar . gz ; \
27
+ fi
26
28
ENV PATH = $PATH:/usr /local /go /bin
27
29
28
30
# Get dep for Go package management and make sure the directory has full rwz permissions for non-root users
Original file line number Diff line number Diff line change @@ -9,16 +9,16 @@ SOURCES := $(shell find $(SOURCE_DIR) -path $(SOURCE_DIR)/vendor -prune -o -name
9
9
DESIGN_DIR =design
10
10
DESIGNS := $(shell find $(SOURCE_DIR ) /$(DESIGN_DIR ) -path $(SOURCE_DIR ) /vendor -prune -o -name '* .go' -print)
11
11
12
+ # This pattern excludes the listed folders while running tests
13
+ TEST_PKGS_EXCLUDE_PATTERN = "vendor|app|tool\/build-tool-detector-cli|design|client|test"
14
+
12
15
include ./.make/docker.mk
13
16
ifeq ($(OS ) ,Windows_NT)
14
17
include ./.make/Makefile.win
15
18
else
16
19
include ./.make/Makefile.lnx
17
20
endif
18
21
19
-
20
-
21
-
22
22
# This is a fix for a non-existing user in passwd file when running in a docker
23
23
# container and trying to clone repos of dependencies
24
24
GIT_COMMITTER_NAME ?= "user"
@@ -177,7 +177,8 @@ generate: prebuild-check $(DESIGNS) $(GOAGEN_BIN) $(VENDOR_DIR) ## Generate GOA
177
177
178
178
.PHONY : test
179
179
test : test-deps # # Executes all tests
180
- $(GINKGO_BIN ) -r
180
+ $(eval TEST_PACKAGES:=$(shell go list ./... | grep -v -E $(TEST_PKGS_EXCLUDE_PATTERN ) ) )
181
+ go test -vet off $(TEST_PACKAGES ) -v
181
182
182
183
.PHONY : format # # Removes unneeded imports and formats source code
183
184
format :
You can’t perform that action at this time.
0 commit comments