From cf13249e9d9f2d085b0682e9e5781ba90920d4bd Mon Sep 17 00:00:00 2001 From: Ycarus Date: Mon, 24 Dec 2018 14:08:47 +0100 Subject: [PATCH] Fix CircleCI --- .circleci/config.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fdbc863de..07fd8cca5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -375,7 +375,7 @@ jobs: - cache-{{ checksum "/tmp/cache-target" }} - run: - name: Build toolchain + name: Build toolchain wrt3200acm no_output_timeout: 30m command: | git clone https://github.com/ysurac/openmptcprouter || true @@ -395,12 +395,12 @@ jobs: - openmptcprouter - run: - name: Build + name: Build wrt3200acm no_output_timeout: 30m command: make IGNORE_ERRORS=m -C ~/openmptcprouter/wrt3200acm/source package/{compile,install,index} target/compile -j2 package/compile -j2 target/install -j2 - run: - name: Deploy + name: Deploy wrt3200acm command: | ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release rsync -av --delete-after ~/openmptcprouter/wrt3200acm/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/wrt3200acm @@ -412,9 +412,10 @@ jobs: - openmptcprouter - run: - name: Build toolchain + name: Build toolchain wrt32x no_output_timeout: 30m command: | + cd ~/openmptcprouter/ git pull || true export OMR_PATH="$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME/${CIRCLE_BRANCH:-$CIRCLE_TAG}" export OMR_FEED_URL="$CIRCLE_REPOSITORY_URL" @@ -425,12 +426,12 @@ jobs: echo -e "$OMR_PUBKEY" > ~/openmptcprouter/wrt32x/source/key-build.pub - run: - name: Build + name: Build wrt32x no_output_timeout: 30m command: make IGNORE_ERRORS=m -C ~/openmptcprouter/wrt32x/source package/{compile,install,index} target/compile -j2 package/compile -j2 target/install -j2 - run: - name: Deploy + name: Deploy wrt32x command: | ssh -p ${OMR_DEPLOY_PORT:-22} deploy@$OMR_DEPLOY_HOST mkdir -p deploy/release rsync -av --delete-after ~/openmptcprouter/wrt32x/source/bin/ -e "ssh -q -p ${OMR_DEPLOY_PORT:-22}" deploy@$OMR_DEPLOY_HOST:deploy/release/wrt32x