Compare commits

...

6 Commits

Author SHA1 Message Date
786de4ae18 2.1.17 2016-06-05 08:00:53 +02:00
62ee8a26a4 fix 2016-06-05 08:00:46 +02:00
f544aef054 2.1.16 2016-06-05 07:50:11 +02:00
cb6867dbde fix 2016-06-05 07:50:04 +02:00
5316740a1a 2.1.15 2016-06-05 07:41:20 +02:00
06bc1e59f8 fix 2016-06-05 07:41:14 +02:00
4 changed files with 8 additions and 31 deletions

View File

@@ -1,35 +1,12 @@
image: hosttoday/ht-docker-node:lts image: hosttoday/ht-docker-node:lts
stages: stages:
- test
- release - release
- trigger - trigger
before_script: before_script:
- npm install -g npmci - npm install -g npmci
testLTS:
stage: test
script:
- npmci test lts
tags:
- docker
testSTABLE:
stage: test
script:
- npmci test stable
tags:
- docker
testLEGACY:
stage: test
script:
- npmci test legacy
tags:
- docker
allow_failure: true
release: release:
stage: release stage: release
script: script:

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{ {
"name": "npmci", "name": "npmci",
"version": "2.1.14", "version": "2.1.17",
"description": "", "description": "",
"main": "dist/index.js", "main": "dist/index.js",
"bin": { "bin": {

View File

@@ -4,7 +4,7 @@ import * as NpmciEnv from "./npmci.env";
export let build = function(){ export let build = function(){
let done = plugins.q.defer(); let done = plugins.q.defer();
plugins.gulp.dest("./Dockerfile*") plugins.gulp.src("./Dockerfile*")
.pipe(readDockerfiles()) .pipe(readDockerfiles())
.pipe(plugins.gulpFunction(function(){ .pipe(plugins.gulpFunction(function(){
sortDockerfiles() sortDockerfiles()
@@ -15,7 +15,7 @@ export let build = function(){
} }
let readDockerfiles = function(){ let readDockerfiles = function(){
return plugins.through2(function(file,enc,cb){ return plugins.through2.obj(function(file,enc,cb){
let myDockerfile = new Dockerfile({ let myDockerfile = new Dockerfile({
filePath:file.path, filePath:file.path,
read:true read:true
@@ -108,7 +108,7 @@ let dockerFileVersion = function(dockerfileNameArg:string):string{
let versionString:string; let versionString:string;
let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/; let versionRegex = /Dockerfile_([a-zA-Z0-9\.]*)$/;
let regexResultArray = versionRegex.exec(dockerfileNameArg); let regexResultArray = versionRegex.exec(dockerfileNameArg);
if(regexResultArray.length = 2){ if(regexResultArray.length == 2){
versionString = regexResultArray[1]; versionString = regexResultArray[1];
} else { } else {
versionString = "latest"; versionString = "latest";