From 0529722b88989ba5290476049318db419480c9e2 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Wed, 3 Jan 2018 21:18:25 +0100 Subject: [PATCH] use ruby image for deployment workflow because we need ruby stuff, not go stuff note: - ruby 2.3 because json library that fpm seemingly wants to use doesn't work with 2.4 (https://github.com/flori/json/issues/303) - for some reason apt-get update no longer needed --- .circleci/config.yml | 3 +-- scripts/build_packages.sh | 1 - scripts/depends.sh | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 36293448d0..d126f72138 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -48,9 +48,8 @@ jobs: - run: scripts/qa/end2end.sh deploy: - working_directory: /go/src/github.com/grafana/metrictank docker: - - image: circleci/golang:1.9.2 + - image: circleci/ruby:2.3 steps: - checkout - attach_workspace: diff --git a/scripts/build_packages.sh b/scripts/build_packages.sh index 8b0af82ca0..ef69922b5b 100755 --- a/scripts/build_packages.sh +++ b/scripts/build_packages.sh @@ -8,7 +8,6 @@ BUILD_TMP=$CODE_DIR/build_tmp # used for temporary data used to construct the pa mkdir $BUILD_TMP mkdir $BUILD_PKG -sudo apt-get update # otherwise the below install command doesn't work sudo apt-get install rpm # to be able to make rpms ARCH="$(uname -m)" diff --git a/scripts/depends.sh b/scripts/depends.sh index ea19ba0396..44ea0051e4 100755 --- a/scripts/depends.sh +++ b/scripts/depends.sh @@ -4,6 +4,5 @@ set -x DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) cd ${DIR} -sudo apt install rubygems ruby-dev -sudo gem install bundler +which bundler &>/dev/null || sudo gem install bundler bundle install