From 600805bb4bae69124bccd342bb3e99a99200a7ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Soko=C5=82owski?= Date: Mon, 19 Feb 2024 16:13:21 +0100 Subject: [PATCH] feat: use two deploy branches for CI builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we have two branches on GitHub that reflect the state of the website after CI build has finished and pushed. See README. Also adds `/build.json` to the site for easy access to build info. Signed-off-by: Jakub SokoĊ‚owski --- Jenkinsfile | 35 +++++++++++++++-------------------- README.md | 8 +++++--- 2 files changed, 20 insertions(+), 23 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1d41d13..03a3e6c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,3 +1,6 @@ +#!/usr/bin/env groovy +library 'status-jenkins-lib@v1.8.8' + pipeline { agent { label 'linux' } @@ -13,10 +16,6 @@ pipeline { environment { GIT_COMMITTER_NAME = 'status-im-auto' GIT_COMMITTER_EMAIL = 'auto@status.im' - PROD_SITE = 'guide.waku.org' - DEV_SITE = 'dev-guide.waku.org' - DEV_HOST = 'jenkins@node-01.do-ams3.sites.misc.statusim.net' - SCP_OPTS = 'StrictHostKeyChecking=no' } stages { @@ -27,28 +26,20 @@ pipeline { } stage('Build') { - steps { + steps { script { sh 'yarn build' - sh "echo ${env.PROD_SITE} > build/CNAME" - } + jenkins.genBuildMetaJSON('build/build.json') + } } } - stage('Publish Prod') { - when { expression { env.GIT_BRANCH ==~ /.*master/ } } + stage('Publish') { steps { sshagent(credentials: ['status-im-auto-ssh']) { - sh "ghp-import -p build" - } - } - } - - stage('Publish Devel') { - when { expression { env.GIT_BRANCH ==~ /.*develop/ } } - steps { - sshagent(credentials: ['jenkins-ssh']) { sh """ - rsync -e 'ssh -o ${SCP_OPTS}' -r --delete build/. \ - ${env.DEV_HOST}:/var/www/${env.DEV_SITE}/ + ghp-import \ + -b ${deployBranch()} \ + -c ${deployDomain()} \ + -p build """ } } @@ -59,3 +50,7 @@ pipeline { cleanup { cleanWs() } } } + +def isMasterBranch() { GIT_BRANCH ==~ /.*master/ } +def deployBranch() { isMasterBranch() ? 'deploy-master' : 'deploy-develop' } +def deployDomain() { isMasterBranch() ? 'guide.waku.org' : 'dev-guide.waku.org' } diff --git a/README.md b/README.md index 9d5ce2f..1947eef 100644 --- a/README.md +++ b/README.md @@ -161,12 +161,14 @@ The static files will be created in the `build` directory. $ yarn serve ``` - ## CI/CD -- The `master` branch is automatically deployed to the production server (e.g., logos.co) through [CI](https://ci.infra.status.im) -- The `develop` branch is automatically deployed to the staging server (e.g., dev.logos.co) through [CI](https://ci.infra.status.im) +- [CI builds](https://ci.infra.status.im/job/website/job/guide.waku.org/) `master` and pushes to `deploy-master` branch, which is hosted at . +- [CI builds](https://ci.infra.status.im/job/website/job/dev-guide.waku.org/) `develop` and pushes to `deploy-develop` branch, which is hosted at . +The hosting is done using [Caddy server with Git plugin for handling GitHub webhooks](https://github.com/status-im/infra-misc/blob/master/ansible/roles/caddy-git). + +Information about deployed build can be also found in `/build.json` available on the website. ## Change Process