File tree 2 files changed +2
-3
lines changed
2 files changed +2
-3
lines changed Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ SHELL = /bin/bash
4
4
# Origin does not point to https://github.com/digitalocean/prometheus-client-c.git in TravisCI so we must add a new
5
5
# remote for fetching. Fetch master, diff on the filenames and look for C files. If no changes to C files are made, skip
6
6
# the build.
7
- CHANGED_FILES = $(shell git remote add ci https://github.com/digitalocean/prometheus-client-c.git > /dev/null 2>&1; git fetch ci master > /dev/null 2>&1; git diff --name-only ci/master | egrep '.* [c|h] $$')
7
+ CHANGED_FILES = $(shell git remote add ci https://github.com/digitalocean/prometheus-client-c.git > /dev/null 2>&1; git fetch ci master > /dev/null 2>&1; git diff --name-only ci/master | egrep -v '.* \.md $$')
8
8
9
9
ifneq ($(shell echo "x${CHANGED_FILES}x" | sed 's/\n\t //') , xx)
10
10
default : build_and_test
Original file line number Diff line number Diff line change @@ -5,8 +5,7 @@ RUN apt-get update && \
5
5
apt-get install -y curl tar build-essential git pkg-config gdb valgrind gcc libmicrohttpd-dev doxygen graphviz && \
6
6
curl -L https://dl.google.com/go/go1.13.1.linux-amd64.tar.gz 2> /dev/null | tar xzvf - -C /usr/local && \
7
7
mkdir -p /gopath/{src,bin} && \
8
- echo 'export GOPATH=/gopath' > /root/.bash_profile && \
9
- echo 'export PATH=$PATH:/usr/local/go/bin:/gopath/bin' > /root/.bash_profile && \
8
+ printf 'export GOPATH=/gopath\n export PATH=$PATH:/usr/local/go/bin:/gopath/bin\n ' > /root/.bash_profile && \
10
9
printf '#!/usr/bin/env bash\n source /root/.bash_profile\n exec /bin/bash $@\n ' > /entrypoint && \
11
10
chmod +x /entrypoint && \
12
11
GOPATH=/gopath /usr/local/go/bin/go get github.com/prometheus/prom2json && \
You can’t perform that action at this time.
0 commit comments