From 7d2462425dd310ee03ae8e9570b32984b3038f6e Mon Sep 17 00:00:00 2001 From: Eric Evenchick Date: Wed, 28 Jan 2015 16:09:15 -0500 Subject: [PATCH] changed target name, added artifact upload --- .travis.yml | 14 +++++++++++++- Makefile | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e287f2f..798869a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,21 @@ notifications: language: c +env: + global: + - "ARTIFACTS_AWS_REGION=us-east-1" + - "ARTIFACTS_S3_BUCKET=cantact-builds" + - secure: "gol8KyPaZuEpibS+JIrzfWuwaYNtHF0gLR0Lol6PM49KZPnHfAg9P2zMNhESL6ZTmWFwEmhxuntFvOQbGqB55cJbmOv3ZeuYkMw4y+GRwKB3pRAqQTQXOx8uBSCvBw+zmwmbswUA+dlKVQAgGvHxjQRwSfByedZsDaCz/ACd7qs=" + - secure: "dxFGsRnHyQWQgFBJztagS7OBWSef/p+tn9JhTgIOAZlI86dEe1bI/grkELsq4EV9IdgHFz6ks9+TT9Sb4IFu7+275sBJKAJOZw7Q2nILkUreF2WMwOJQd2ih0uQu3b68ccQxqQhp3s5FrOcUedwqnrM+Jk3+MhpKWO+cVgQ0SqQ=" + before_script: - sudo apt-add-repository 'deb http://archive.ubuntu.com/ubuntu trusty main universe multiverse restricted' - sudo apt-get update -qq - sudo apt-get install -y gcc-arm-none-eabi + - curl -sL https://raw.githubusercontent.com/travis-ci/artifacts/master/install | bash + - export PATH=$PATH:~/bin/ -script: make BUILD_NUMBER=$TRAVIS_BUILD_NUMBER \ No newline at end of file +script: make BUILD_NUMBER=$TRAVIS_BUILD_NUMBER + +after_success: + "travis-artifacts upload --target-path=builds/b$TRAVIS_BUILD_NUMBER build/CANtact*" \ No newline at end of file diff --git a/Makefile b/Makefile index 32f9486..f088260 100644 --- a/Makefile +++ b/Makefile @@ -14,7 +14,7 @@ BUILD_NUMBER ?= 0 SOURCES = main.c usbd_conf.c usbd_cdc_if.c usb_device.c usbd_desc.c stm32f0xx_hal_msp.c stm32f0xx_it.c system_stm32f0xx.c can.c slcan.c # TARGET: name of the user application -TARGET = main +TARGET = CANtact-b$(BUILD_NUMBER) # BUILD_DIR: directory to place output files in BUILD_DIR = build @@ -168,6 +168,7 @@ $(BUILD_DIR): clean: -rm $(BUILD_DIR)/*.o -rm $(BUILD_DIR)/*.elf + -rm $(BUILD_DIR)/*.hex -rm $(BUILD_DIR)/*.map .PHONY: clean all cubelib