summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-08-19 01:02:12 -0700
committerelijah <elijah@riseup.net>2016-08-19 01:02:12 -0700
commit90cd79b98da1c131cc948949b47d473a9738a728 (patch)
treeaac7010c4822cc528b864f214d10a158644f69d4
parent81e7054c8caeef32907983a493e78744f81cf645 (diff)
parentf23617b412f16aafcc917a5aee67d7762135a228 (diff)
Merge branch 'rake_install' of https://0xacab.org/varac/leap_cli into develop
-rw-r--r--.gitignore1
-rw-r--r--.gitlab-ci.yml8
-rw-r--r--README.md2
3 files changed, 8 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index fbf62f9..f4277a7 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 0e455a8..3b5bee8 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 24f687b..b543a88 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.