Fix TypeScript execution

sequelize · Jan 23, 2021 · 0c178a1 · 0c178a1
1 parent 153cfd2
commit 0c178a1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 14 deletions.
diff --git a/setup/global-adjusts.js b/setup/global-adjusts.js
@@ -20,9 +20,9 @@ process.on("unhandledRejection", e => {
   throw e;
 });
 
-const sequelizeVersion = require('sequelize/package.json').version;
+const sequelizeVersion = require('./sequelize-version');
 
-if (/^v?5/.test(sequelizeVersion)) {
+if (sequelizeVersion.startsWith('v5')) {
   Sequelize.Promise.onPossiblyUnhandledRejection(e => {
     console.error('An unhandled rejection occurred:');
     throw e;

diff --git a/setup/runner.js b/setup/runner.js
@@ -2,22 +2,24 @@
 
 require('./global-adjusts');
 
+const sequelizeVersion = require('./sequelize-version');
+
+const USE_TS = process.env.CI_COMBINATION === 'v6 with TS';
+
 async function run() {
-  console.log('\n' + '-'.repeat(30) + '\n');
+  let heading = `Running SSCCE for ${process.env.DIALECT.toUpperCase()} with Sequelize ${sequelizeVersion}`;
+  if (USE_TS) heading += ' with TypeScript';
+  heading = `===== ${heading} =====`;
+
+  console.blue('\n' + '-'.repeat(heading.length));
+  console.blue(heading);
+  console.blue('-'.repeat(heading.length) + '\n');
 
   if (process.env.LOCAL_SSCCE) {
     console.gold('Warning: running the SSCCE locally will use SQLite only. To run your SSCCE in all dialects, just configure Travis CI / AppVeyor in your GitHub repository.\n');
   }
 
-  if (process.env.USE_TS) {
-    console.blue(`===== Running SSCCE for ${process.env.DIALECT.toUpperCase()} with TypeScript =====`);
-  } else {
-    console.blue(`===== Running SSCCE for ${process.env.DIALECT.toUpperCase()} =====`);
-  }
-
-  console.log('\n' + '-'.repeat(30) + '\n');
-
-  if (process.env.USE_TS) {
+  if (USE_TS) {
     const { run } = require('./../ts-dist/sscce'); // eslint-disable-line
     await run();
   } else {
@@ -28,11 +30,11 @@ async function run() {
 (async () => {
   try {
     await run();
-    console.log('\n' + '-'.repeat(30) + '\n');
+    console.log('\n' + '-'.repeat(40) + '\n');
     console.green('SSCCE done without errors!');
   } catch (e) {
     console.red(e);
-    console.log('\n' + '-'.repeat(30) + '\n');
+    console.log('\n' + '-'.repeat(40) + '\n');
     console.red('SSCCE done with error (see above).');
     process.exit(1); // eslint-disable-line no-process-exit
   }

diff --git a/setup/sequelize-version.js b/setup/sequelize-version.js
@@ -0,0 +1 @@
+module.exports = require('sequelize/package.json').version.replace(/^v?/, 'v');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		module.exports = require('sequelize/package.json').version.replace(/^v?/, 'v');