From df855afd2edf180e66162587f48669a99a5270c5 Mon Sep 17 00:00:00 2001 From: Rod Vagg Date: Mon, 12 Jun 2017 21:47:30 +1000 Subject: [PATCH] add v8-canary builds to www setup --- .../config/nightly-builder-v8-canary.json.j2 | 10 ++++++++++ setup/www/tasks/tools.yaml | 4 ++-- setup/www/tasks/user.yaml | 2 ++ setup/www/tools/promote/promote_nightly.sh | 12 ++++++++++++ setup/www/tools/promote/settings | 8 ++++++++ 5 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 setup/www/resources/config/nightly-builder-v8-canary.json.j2 diff --git a/setup/www/resources/config/nightly-builder-v8-canary.json.j2 b/setup/www/resources/config/nightly-builder-v8-canary.json.j2 new file mode 100644 index 000000000..97a4eff34 --- /dev/null +++ b/setup/www/resources/config/nightly-builder-v8-canary.json.j2 @@ -0,0 +1,10 @@ +{ + "jenkinsToken": "{{ jenkins_token }}", + "jenkinsJobUrl": "https://ci-release.nodejs.org/job/iojs+release", + "jenkinsCrumbUrl": "https://ci-release.nodejs.org/crumbIssuer/api/json", + "githubAuthUser": "{{ github_auth_user }}", + "githubAuthToken": "{{ github_auth_token }}", + "githubOrg": "nodejs", + "githubRepo": "node-v8", + "githubScheme": "https://github.com/", +} \ No newline at end of file diff --git a/setup/www/tasks/tools.yaml b/setup/www/tasks/tools.yaml index 77e43475b..b958f0853 100644 --- a/setup/www/tasks/tools.yaml +++ b/setup/www/tasks/tools.yaml @@ -23,8 +23,8 @@ dest: /etc/crontab line: "{{ item }}" with_items: - - '0 20 * * * dist /usr/bin/nodejs-nightly-builder --type nightly --ref heads/v6.x --config /etc/nightly-builder.json' - - '0 19 * * * dist /usr/bin/nodejs-nightly-builder --type nightly --ref heads/v7.x --config /etc/nightly-builder.json' + - '0 20 * * * dist /usr/bin/nodejs-nightly-builder --type v8-canary --ref heads/canary --config /etc/nightly-builder-v8-canary.json' + - '0 19 * * * dist /usr/bin/nodejs-nightly-builder --type nightly --ref heads/v8.x --config /etc/nightly-builder.json' - '0 18 * * * dist /usr/bin/nodejs-nightly-builder --type nightly --ref heads/master --config /etc/nightly-builder.json' - '1 0 * * * root npm update -g nodejs-latest-linker nodejs-dist-indexer nodejs-nightly-builder >& /dev/null' tags: tools diff --git a/setup/www/tasks/user.yaml b/setup/www/tasks/user.yaml index a57fa9745..6aa669fd4 100644 --- a/setup/www/tasks/user.yaml +++ b/setup/www/tasks/user.yaml @@ -55,6 +55,8 @@ - nodejs/rc - nodejs/release - nodejs/test + - nodejs/v8-canary + - nodejs/chakracore-nightly - nodejs/docs - iojs/next-nightly - iojs/nightly diff --git a/setup/www/tools/promote/promote_nightly.sh b/setup/www/tools/promote/promote_nightly.sh index c62369fe2..9addfa878 100755 --- a/setup/www/tools/promote/promote_nightly.sh +++ b/setup/www/tools/promote/promote_nightly.sh @@ -36,3 +36,15 @@ dstdir=$test_dstdir dirmatch=$test_dirmatch . ${__dirname}/_promote.sh $site + +srcdir=$v8_canary_srcdir +dstdir=$v8_canary_dstdir +dirmatch=$v8_canary_dirmatch + +. ${__dirname}/_promote.sh $site + +srcdir=$chakracore_nightly_srcdir +dstdir=$chakracore_nightly_dstdir +dirmatch=$chakracore_nightly_dirmatch + +. ${__dirname}/_promote.sh $site diff --git a/setup/www/tools/promote/settings b/setup/www/tools/promote/settings index b79562543..8b7429678 100755 --- a/setup/www/tools/promote/settings +++ b/setup/www/tools/promote/settings @@ -13,6 +13,10 @@ test_srcdir=${staging_rootdir}custom test_dstdir=${dist_rootdir}test test_dirmatch="-test[0-9]+" +v8_canary_srcdir=${staging_rootdir}custom +v8_canary_dstdir=${dist_rootdir}v8-canary +v8_canary_dirmatch="-v8-canary[0-9]+" + nightly_srcdir=${staging_rootdir}nightly nightly_dstdir=${dist_rootdir}nightly nightly_dirmatch=.* @@ -20,3 +24,7 @@ nightly_dirmatch=.* next_nightly_srcdir=${staging_rootdir}next-nightly next_nightly_dstdir=${dist_rootdir}next-nightly next_nightly_dirmatch=.* + +chakracore_nightly_srcdir=${staging_rootdir}chakracore-nightly +chakracore_nightly_dstdir=${dist_rootdir}chakracore-nightly +chakracore_nightly_dirmatch=.*