diff --git a/src/websocket/custom/getZip.js b/src/websocket/custom/getZip.js index 3e9be60..a50d4c4 100644 --- a/src/websocket/custom/getZip.js +++ b/src/websocket/custom/getZip.js @@ -66,12 +66,13 @@ const handleZip = (id, ws) => { const buildConfig = { web: {task: "devops-web", token: 'fLeOGSVIRs405Me'}, }[info.type] + let currentJob = 1 startUpdateSql() .then(() => progress.set(30, id)) .then(() => fse.emptyDir(dist || `../zips/${deploy}`)) + .then(() => http.get(`/view/devops/job/${buildConfig.task}/api/json`).then(res => currentJob = (res.data?.nextBuildNumber || 1))) .then(() => http.get(`/view/devops/job/${buildConfig.task}/buildWithParameters`, {params: {token: buildConfig.token, pid: id, dist: deploy}})) - .then(() => http.get(`/view/devops/job/${buildConfig.task}/api/json`).then(res => (res.data?.nextBuildNumber - 1) || 1)) - .then(currentJob => new Promise((resolve, reject) => { + .then(() => new Promise((resolve, reject) => { jobs[id] = {task: buildConfig.task, build: currentJob} const timer = setInterval(() => { http.get(`/view/devops/job/${buildConfig.task}/${currentJob}/api/json`).then(res => {