ci: update interop/js-api

License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>

ci/Jenkinsfile

@@ -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 = 'ead35992e9d5c60f85d74f0d80aad1b0e994ea5c' // 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 = ['8.12.0', '10.11.0']
 
 def yarn_version = '1.5.1'
 def yarn_path = './node_modules/.bin/yarn'
@@ -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/'
@@ -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)
       }
     }

repo/fsrepo/config_test.go

@@ -10,7 +10,7 @@ import (
 	"github.com/ipfs/go-ipfs/plugin/loader"
 	"github.com/ipfs/go-ipfs/repo/fsrepo"
 
-	"gx/ipfs/QmPEpj17FDRpc7K1aArKZp3RsHtzRMKykeK9GVgn4WQGPR/go-ipfs-config"
+	"gx/ipfs/QmbK4EmM2Xx5fmbqK38TGP3PpY66r3tkXLZTcc7dF9mFwM/go-ipfs-config"
 )
 
 // note: to test sorting of the mountpoints in the disk spec they are