Skip to content

Commit

Permalink
ci: update interop/js-api
Browse files Browse the repository at this point in the history
License: MIT
Signed-off-by: Łukasz Magiera <[email protected]>
  • Loading branch information
magik6k committed Dec 30, 2018
1 parent 1564f3c commit 8745a29
Showing 1 changed file with 5 additions and 17 deletions.
22 changes: 5 additions & 17 deletions ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ def build_platforms = [
]

/* js-* tests */
def js_api_commit = 'e61155ae8edaee902cb3a1dcd8ba3d3afb093d1c' // 24.0.1
def interop_commit = '6593ccdca5d7b4c747787f71f7ac4b5f6f1ab10b'
def js_api_commit = '587c787de8ec60efc1a812e74e44549d3ed33a75' // 26.1.2
def interop_commit = '4085089c323ba19d60ca6f55872fbc2ac40e066c'

def js_api_platforms = ['linux', 'macos']
def js_api_node_versions = ['8.11.3', '10.4.1']
def js_api_node_versions = ['10.11.0']

def yarn_version = '1.5.1'
def yarn_path = './node_modules/.bin/yarn'
Expand Down Expand Up @@ -128,8 +128,6 @@ def jsTestStep = { os, nodeVer, repo, commit ->
dir('.js-test') {
checkout changelog: false, scm: [$class: 'GitSCM', branches: [[name: commit]], userRemoteConfigs: [[url: repo]]]

//todo: deduplicate with https://github.com/ipfs/jenkins-libs/blob/master/vars/javascript.groovy somehow

fileExists 'package.json'
nodejs(nodeVer) {
sh 'rm -rf node_modules/'
Expand Down Expand Up @@ -279,21 +277,11 @@ ansiColor('xterm') { withEnv(['TERM=xterm-color']) {
)
}

//reportedStage('interop') {
// def steps = [:]
// js_api_platforms.each {os ->
// js_api_node_versions.each { nodeVer ->
// steps["interop-${os}-${nodeVer}"] = jsTestStep(os, nodeVer, 'https://github.com/ipfs/interop', interop_commit)
// }
// }
//
// parallel steps
//}

reportedStage('apis') {
reportedStage('interop/apis') {
def steps = [:]
js_api_platforms.each {os ->
js_api_node_versions.each { nodeVer ->
steps["interop-${os}-${nodeVer}"] = jsTestStep(os, nodeVer, 'https://github.com/ipfs/interop', interop_commit)
steps["js-api-${os}-${nodeVer}"] = jsTestStep(os, nodeVer, 'https://github.com/ipfs/js-ipfs-api', js_api_commit)
}
}
Expand Down

0 comments on commit 8745a29

Please sign in to comment.