Commit ce934bef by Feanil Patel

Allow make to run locally without throwing errors.

It wasn't fully broken but was throwing exceptions anytime you
ran any make command because the errors happened during variable
interpolation.
parent 15713e73
...@@ -4,7 +4,8 @@ SHARD=0 ...@@ -4,7 +4,8 @@ SHARD=0
SHARDS=1 SHARDS=1
dockerfiles:=$(shell ls docker/build/*/Dockerfile) dockerfiles:=$(shell ls docker/build/*/Dockerfile)
images:=$(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py) all_images:=$(patsubst docker/build/%/Dockerfile,%,$(dockerfiles))
images:=$(if $(TRAVIS_COMMIT_RANGE),$(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py),$(all_images))
docker_build=docker.build. docker_build=docker.build.
docker_test=docker.test. docker_test=docker.test.
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
yml_files:=$(shell find . -name "*.yml") yml_files:=$(shell find . -name "*.yml")
json_files:=$(shell find . -name "*.json") json_files:=$(shell find . -name "*.json")
jinja_files:=$(shell find . -name "*.j2") jinja_files:=$(shell find . -name "*.j2")
images = $(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py) images = $(if $(TRAVIS_COMMIT_RANGE), $(shell git diff --name-only $(TRAVIS_COMMIT_RANGE) | python util/parsefiles.py), $(all_images))
test: test.syntax test.edx_east_roles test: test.syntax test.edx_east_roles
......
...@@ -7,7 +7,7 @@ import argparse ...@@ -7,7 +7,7 @@ import argparse
import logging import logging
import docker_images import docker_images
TRAVIS_BUILD_DIR = os.environ.get("TRAVIS_BUILD_DIR") TRAVIS_BUILD_DIR = os.environ.get("TRAVIS_BUILD_DIR", "")
CONFIG_FILE_PATH = pathlib2.Path(TRAVIS_BUILD_DIR, "util", "parsefiles_config.yml") CONFIG_FILE_PATH = pathlib2.Path(TRAVIS_BUILD_DIR, "util", "parsefiles_config.yml")
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
......
...@@ -4,7 +4,7 @@ import pathlib2 ...@@ -4,7 +4,7 @@ import pathlib2
import itertools import itertools
import sys import sys
TRAVIS_BUILD_DIR = os.environ.get("TRAVIS_BUILD_DIR") TRAVIS_BUILD_DIR = os.environ.get("TRAVIS_BUILD_DIR", "")
CONFIG_FILE_PATH = pathlib2.Path(TRAVIS_BUILD_DIR, "util", "parsefiles_config.yml") CONFIG_FILE_PATH = pathlib2.Path(TRAVIS_BUILD_DIR, "util", "parsefiles_config.yml")
def get_used_images(images): def get_used_images(images):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment