From 14a896ac10a897d5f375e22090f111a1337df157 Mon Sep 17 00:00:00 2001 From: Drew Short Date: Sun, 29 Dec 2019 11:02:29 -0600 Subject: [PATCH 1/2] Fixing the broken pipeline --- Dockerfile | 2 +- pipeline.yml | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 33 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index ff354d8..789e303 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12-14-stretch +FROM node:12.14-stretch COPY . /opt/baphomet RUN npm install WORKDIR /opt/baphomet diff --git a/pipeline.yml b/pipeline.yml index 2499ea1..2839e8f 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -8,6 +8,14 @@ resources: private_key: | ((pull_key)) branch: master + - name: baphomet-js-git-develop + type: git + icon: git + source: + uri: ssh://git@git.nulloctet.com:8437/warricksothr/baphomet-js.git + private_key: | + ((pull_key)) + branch: develop jobs: - name: test @@ -20,7 +28,7 @@ jobs: platform: linux image_resource: type: registry-image - source: { repository: node, tag: "12-14-stretch" } + source: { repository: node, tag: "12.14-stretch" } inputs: - name: baphomet-js-git run: @@ -33,6 +41,29 @@ jobs: cd baphomet-js-git npm install npm test + - name: test-develop + public: true + plan: + - get: baphomet-js-git-develop + trigger: true + - task: run-tests + config: + platform: linux + image_resource: + type: registry-image + source: { repository: node, tag: "12.14-stretch" } + inputs: + - name: baphomet-js-git-develop + run: + path: /bin/sh + args: + - -c + - | + echo "Node Version: $(node --version)" + echo "NPM Version: $(npm --version)" + cd baphomet-js-git-develop + npm install + npm test - name: package public: true plan: -- 2.30.2 From 2bf725822f2d256390ee1b2d3495668ce405f908 Mon Sep 17 00:00:00 2001 From: Drew Short Date: Sun, 29 Dec 2019 11:08:48 -0600 Subject: [PATCH 2/2] Removing the public flags from the pipeline --- pipeline.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/pipeline.yml b/pipeline.yml index 2839e8f..41c9231 100644 --- a/pipeline.yml +++ b/pipeline.yml @@ -19,7 +19,6 @@ resources: jobs: - name: test - public: true plan: - get: baphomet-js-git trigger: true @@ -42,7 +41,6 @@ jobs: npm install npm test - name: test-develop - public: true plan: - get: baphomet-js-git-develop trigger: true @@ -65,7 +63,6 @@ jobs: npm install npm test - name: package - public: true plan: - get: baphomet-js-git passed: [test] -- 2.30.2