diff --git a/.Makefile.swp b/.Makefile.swp new file mode 100644 index 0000000..87b4615 Binary files /dev/null and b/.Makefile.swp differ diff --git a/.drone.yml b/.drone.yml index d56bd0a..af9edab 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,11 +7,18 @@ steps: commands: - which make || apk add make - make fetch + - name: build image: openjdk:13-alpine commands: - which make || apk add make - make build +- name: build-7 + image: openjdk:13-alpine + commands: + - which make || apk add make + - make build PLUGIN_ES=es70x ES_VERSION=7.0.1 + - name: upload image: python:3.7-alpine environment: @@ -26,3 +33,17 @@ steps: when: event: - tag +- name: upload-7 + image: python:3.7-alpine + environment: + AWS_ACCESS_KEY_ID: + from_secret: aws_access_key + AWS_SECRET_ACCESS_KEY: + from_secret: aws_secret_key + commands: + - which make || apk add make + - which aws || pip install awscli + - make upload PLUGIN_ES=es70x ES_VERSION=7.0.1 + when: + event: + - tag diff --git a/Makefile b/Makefile index 82fdec5..3ad5308 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ $(PACKAGE_FILE): upload: $(PACKAGE_FILE) for bucket in $(S3_BUCKETS); do \ - aws s3 cp --acl public-read $(PACKAGE_FILE) s3://$$bucket/$(S3_PREFIX)/$(PACKAGE); \ + aws s3 cp --quiet --acl public-read $(PACKAGE_FILE) s3://$$bucket/$(S3_PREFIX)/$(PACKAGE); \ done clean_s3: