- fetch master branch during build.sh process - ensure the clean target is called with the default
This commit is contained in:
parent
29a4d9b0d0
commit
87bc4d22f0
2
Makefile
2
Makefile
@ -17,7 +17,7 @@ DIRS := $(shell find $(IMAGES_PATH) -mindepth 3 -maxdepth 3 -type d | sed 's|$(I
|
||||
.PHONY: list $(DIRS)
|
||||
|
||||
.DEFAULT_GOAL := default
|
||||
default:
|
||||
default: clean
|
||||
./ci/build.sh
|
||||
|
||||
# Make all images
|
||||
|
||||
@ -1,6 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Check for changes in images/ folder and the builds/ folder
|
||||
git fetch origin master:master
|
||||
if [ "$(git branch --show-current)" = "master" ]; then
|
||||
builds_changes=$(git diff --name-only HEAD^...master | grep -E '^builds/')
|
||||
images_changes=$(git diff --name-only HEAD^...master | grep -E '^images/')
|
||||
|
||||
Loading…
Reference in New Issue
Block a user