Skip to content

Commit

Permalink
[circleci] use latest s2i-openresty image
Browse files Browse the repository at this point in the history
  • Loading branch information
mikz committed Feb 14, 2018
1 parent 3569f6f commit f710d93
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 5 deletions.
10 changes: 10 additions & 0 deletions .busted
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
local ci = os.getenv('CI')

if ci then
return {
default = {
output = 'junit',
Xoutput = 'tmp/junit/busted.xml',
}
}
end
22 changes: 17 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,23 @@ version: 2
jobs:
build:
docker:
- image: quay.io/3scale/s2i-openresty-centos7:luarocks-build
- image: quay.io/3scale/s2i-openresty-centos7:master
working_directory: /opt/app-root/lua-resty-url
steps:
- checkout
- run: luarocks make rockspecs/*.rockspec
- run: luarocks build rockspecs/*.rockspec
- run: luarocks install busted
- run: bin/busted
- restore_cache:
keys:
- resty-url-rover-{{ arch }}-{{ checksum "Roverfile.lock" }}
- resty-url-rover-{{ arch }}-{{ .Branch }}
- resty-url-rover-{{ arch }}-master
- run: mkdir -p tmp/junit; rover install
- save_cache:
key: resty-url-rover-{{ arch }}-{{ checksum "Roverfile.lock" }}
paths:
- lua_modules
- run: busted
- store_artifacts:
path: tmp
destination: tmp
- store_test_results:
path: tmp/junit
7 changes: 7 additions & 0 deletions Roverfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
luarocks {
group 'test' {
module { 'busted' },
},
}


10 changes: 10 additions & 0 deletions Roverfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
busted 2.0.rc12-1
dkjson 2.5-2
lua-term 0.7-1
lua_cliargs 3.0-1
luafilesystem 1.7.0-2
luassert 1.7.10-0
luasystem 0.2.1-0
mediator_lua 1.1.2-0
penlight 1.5.4-1
say 1.3-1

0 comments on commit f710d93

Please sign in to comment.