From e0c738c09262409bc4f97906a3e95462c42bbff2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Thu, 1 Dec 2022 10:19:14 +0100 Subject: [PATCH] ci: fix builds broken by moving to packages/core MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Broken by: https://github.com/waku-org/js-waku/commit/b975943e Signed-off-by: Jakub SokoĊ‚owski --- ci/{Jenkinsfile.gh-pages => Jenkinsfile} | 14 ++++++++++---- package.json | 1 + packages/core/package.json | 1 - 3 files changed, 11 insertions(+), 5 deletions(-) rename ci/{Jenkinsfile.gh-pages => Jenkinsfile} (85%) diff --git a/ci/Jenkinsfile.gh-pages b/ci/Jenkinsfile similarity index 85% rename from ci/Jenkinsfile.gh-pages rename to ci/Jenkinsfile index a095b3df8e..ccacaf9878 100644 --- a/ci/Jenkinsfile.gh-pages +++ b/ci/Jenkinsfile @@ -14,29 +14,35 @@ pipeline { GIT_AUTHOR_NAME = 'status-im-auto' GIT_AUTHOR_EMAIL = 'auto@status.im' PUPPETEER_SKIP_DOWNLOAD = 'true' + NO_COLOR = 'true' } stages { stage('Deps') { steps { - sh 'npm ci' + sh 'npm install' + } + } + + stage('Packages') { + steps { + sh 'npm run build' } } stage('Build') { steps { - sh 'npm run build' sh 'npm run doc' } } stage('Publish') { when { expression { GIT_BRANCH.endsWith('master') } } - steps { script { + steps { sshagent(credentials: ['status-im-auto-ssh']) { sh 'npm run deploy' } - } } + } } } post { diff --git a/package.json b/package.json index b72798f9b2..8d823b1ecd 100644 --- a/package.json +++ b/package.json @@ -22,6 +22,7 @@ "test:browser": "npm run test:browser --workspaces --if-present", "test:node": "npm run test:node --workspaces --if-present", "proto": "npm run proto --workspaces --if-present", + "deploy": "node ci/deploy.js", "doc": "run-s doc:*", "doc:html": "typedoc # --treatWarningsAsErrors", "doc:cname": "echo 'js.waku.org' > docs/CNAME", diff --git a/packages/core/package.json b/packages/core/package.json index 49cfb1a0bf..43d058a372 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -75,7 +75,6 @@ "watch:build": "tsc -p tsconfig.json -w", "watch:test": "mocha --watch", "prepublish": "npm run build", - "deploy": "node ci/deploy.js", "reset-hard": "git clean -dfx -e .idea && git reset --hard && npm i && npm run build" }, "engines": {