diff --git a/.gitignore b/.gitignore index fbf62f942bb8168f7ee8cdab283e91df0611a71e..f4277a7d74bb2cd17fe7744e1b84c0842b9d05e1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ Gemfile.lock pkg junk test/provider/hiera +test/provider/nodes/ test/provider/files/nodes/ test/provider/files/ca/ test/provider/files/ssh/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e455a866373b1398df067db7948fb08fb6a452d..3b5bee84e7c00c031c582aa1b7871925bafbb2cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,6 @@ -image: ruby:2.1 +image: leapcode/ruby:2.1-slim stages: - - syntax - build - trigger @@ -9,6 +8,11 @@ build: stage: build script: - rake build + #- sudo rake install + #- ./bin/leap + - gem install --user-install pkg/leap_cli-*.gem + - export PATH="$PATH:$(ruby -e 'puts Gem.user_dir')/bin" + - leap artifacts: paths: - pkg/leap_cli-*.gem diff --git a/README.md b/README.md index 24f687bb09bca2f9bb56139d110c7b554a2b52ee..b543a886b47c264ecbf0bcbe0d53bacc4f628ed1 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Installation Install prerequisites: - sudo apt-get install git ruby ruby-dev rsync openssh-client openssl rake + sudo apt-get install git ruby ruby-dev rsync openssh-client openssl rake gcc make zlib1g-dev NOTE: leap_cli requires ruby 1.9 or later.