Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify our makefile as much as possible #753

Merged
merged 8 commits into from
Jul 29, 2019
Merged

Simplify our makefile as much as possible #753

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bc88ab4
big makefile overhaul, still missing a lot of support however, wanted…
slim-bean Jul 15, 2019
8eb185d
adding lint and test in image targets
slim-bean Jul 15, 2019
817b2b3
adding back conditional build to simplify build in container vs not
slim-bean Jul 16, 2019
596a9a8
updating circle config
slim-bean Jul 26, 2019
3762673
fixing up loki-canary build
slim-bean Jul 26, 2019
dd13861
Adding version information to make sure it gets into builds
slim-bean Jul 26, 2019
f6f8020
allow the BUILD_IN_CONTAINER to be overriden by env var
slim-bean Jul 26, 2019
3cbb309
including all the PHONY targets
slim-bean Jul 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 10 additions & 18 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ jobs:
- run:
name: Run Unit Tests
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false test
make test

lint:
<<: *defaults
Expand All @@ -68,13 +67,11 @@ jobs:
- run:
name: Lint
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false lint
make lint

- run:
name: Check Generated Fies
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false check-generated-files

build:
Expand All @@ -86,22 +83,19 @@ jobs:
- run:
name: Promtail cross platform
command: |
touch loki-build-image/.uptodate &&
make GOOS=linux BUILD_IN_CONTAINER=false cmd/promtail/promtail
make GOOS=linux BUILD_IN_CONTAINER=false promtail
rm cmd/promtail/promtail
make GOOS=windows BUILD_IN_CONTAINER=false cmd/promtail/promtail
make GOOS=windows BUILD_IN_CONTAINER=false promtail

- run:
name: Build Images
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false
make images

- run:
name: Save Images
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false save-images
make save-images

- save_cache:
key: v1-loki-{{ .Branch }}-{{ .Revision }}
Expand All @@ -127,8 +121,7 @@ jobs:
- run:
name: Load Images
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false load-images
make load-images

- run:
name: Push Images
Expand All @@ -143,7 +136,7 @@ jobs:
command: |
if [ -n "$DOCKER_USER" ]; then
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
make BUILD_IN_CONTAINER=false push-plugin
make docker-driver-push
fi

publish-master:
Expand All @@ -160,8 +153,7 @@ jobs:
- run:
name: Load Images
command: |
touch loki-build-image/.uptodate &&
make BUILD_IN_CONTAINER=false load-images
make load-images

- run:
name: Push Images
Expand All @@ -174,7 +166,7 @@ jobs:
command: |
if [ -n "$DOCKER_USER" ]; then
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" &&
PLUGIN_TAG=master make BUILD_IN_CONTAINER=false push-plugin && PLUGIN_TAG=latest make BUILD_IN_CONTAINER=false push-plugin
PLUGIN_TAG=master make docker-driver-push && PLUGIN_TAG=latest make docker-driver-push
fi

test-helm:
Expand Down
Loading