diff --git a/Jenkinsfile b/Jenkinsfile index cf9b8cd67..507e5d1f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -106,13 +106,15 @@ pipeline { }} steps { configFileProvider([ - configFile(fileId: "config.${env.NODE_ENV}.ini", + configFile(fileId: "config.${NODE_ENV}.ini", variable: 'MYSQL_CONFIG') ]) { - sh 'cp "$MYSQL_CONFIG" db/config.$NODE_ENV.ini' + sh 'mkdir -p db/remotes' + sh 'cp "$MYSQL_CONFIG" db/remotes/$NODE_ENV.ini' + } + nodejs('node-v20') { + sh 'npx myt push $NODE_ENV --force --commit' } - - sh 'db/import-changes.sh -f $NODE_ENV' } } } diff --git a/back/tests.js b/back/tests.js index 9946d09ed..45d19a671 100644 --- a/back/tests.js +++ b/back/tests.js @@ -26,7 +26,8 @@ async function test() { await myt.init({ workspace: path.join(__dirname, '..'), random: true, - ci: isCI + ci: isCI, + network: isCI ? 'jenkins' : null }); const {dbConfig} = await myt.run(Run); diff --git a/db/dump/fixtures.after.sql b/db/dump/fixtures.after.sql index 370ee0e3b..57ccb8626 100644 --- a/db/dump/fixtures.after.sql +++ b/db/dump/fixtures.after.sql @@ -14,10 +14,10 @@ INSERT INTO vn.entryConfig (defaultEntry, mailToNotify, inventorySupplierFk, max VALUES(1, NULL, 1, 300, 1); */ -- XXX: eti -/* #5483 + INSERT INTO vn.travel (id,shipped,landed,warehouseInFk,warehouseOutFk,`ref`,m3,kg,cargoSupplierFk) VALUES (9,'2022-05-20','2022-05-20',13,4,'nine travel',69.0,600,1); - +/* #5483 INSERT INTO vn.entry (id, supplierFk, dated, invoiceNumber, evaNotes, travelFk, companyFk) VALUES (9, 1, '0000-00-00 00:00:00', 'Movement 9', 'observation nine', 8, 442), @@ -222,10 +222,10 @@ INSERT INTO vn.expeditionStateType (id, description, code) INSERT INTO vn.expedition (agencyModeFk,ticketFk,isBox,counter,hostFk,hasNewRoute) VALUES (1,21,1,1,'',0); - +/* #5483 INSERT INTO vn.sectorCollection (id, created, userFk, sectorFk) VALUES(18, '2022-07-29 09:03:31', 9, 1); - +*/ INSERT INTO vn.saleGroup (id, created, userFk, parkingFk, sectorFk) VALUES(3, '2022-07-29 07:18:49', 9, NULL, 1); diff --git a/package-lock.json b/package-lock.json index 04964d0ff..cab69c696 100644 --- a/package-lock.json +++ b/package-lock.json @@ -54,7 +54,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/preset-env": "^7.11.0", "@babel/register": "^7.7.7", - "@verdnatura/myt": "^1.5.31", + "@verdnatura/myt": "^1.5.32", "angular-mocks": "^1.7.9", "babel-jest": "^26.0.1", "babel-loader": "^8.2.4", @@ -3375,9 +3375,9 @@ } }, "node_modules/@verdnatura/myt": { - "version": "1.5.31", - "resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.31.tgz", - "integrity": "sha512-1mh5lY+gYRnvZsJUmc4t5kTyoo4uSvKJBI6KE1H+VEOnF9uuxSlie6srM04KexjzXIlrWa3xnZIYDrXP2D+fAQ==", + "version": "1.5.32", + "resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.32.tgz", + "integrity": "sha512-LAxg2Ri+QWuFjWbm9Hf5iPE4i5qqGTrKtgwOuNzTri8bErCwPbQRJWgIJBv4xKTppXTm7tBWOUF4+IBf6Ep8Nw==", "dev": true, "dependencies": { "@sqltools/formatter": "^1.2.5", @@ -30604,9 +30604,9 @@ } }, "@verdnatura/myt": { - "version": "1.5.31", - "resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.31.tgz", - "integrity": "sha512-1mh5lY+gYRnvZsJUmc4t5kTyoo4uSvKJBI6KE1H+VEOnF9uuxSlie6srM04KexjzXIlrWa3xnZIYDrXP2D+fAQ==", + "version": "1.5.32", + "resolved": "https://registry.npmjs.org/@verdnatura/myt/-/myt-1.5.32.tgz", + "integrity": "sha512-LAxg2Ri+QWuFjWbm9Hf5iPE4i5qqGTrKtgwOuNzTri8bErCwPbQRJWgIJBv4xKTppXTm7tBWOUF4+IBf6Ep8Nw==", "dev": true, "requires": { "@sqltools/formatter": "^1.2.5", diff --git a/package.json b/package.json index 18742cf56..446ee7db0 100644 --- a/package.json +++ b/package.json @@ -57,7 +57,7 @@ "@babel/plugin-syntax-dynamic-import": "^7.7.4", "@babel/preset-env": "^7.11.0", "@babel/register": "^7.7.7", - "@verdnatura/myt": "^1.5.31", + "@verdnatura/myt": "^1.5.32", "angular-mocks": "^1.7.9", "babel-jest": "^26.0.1", "babel-loader": "^8.2.4",