Merge branch 'main' into migration

bytebase · Mar 14, 2024 · 963fc22 · 963fc22
2 parents 3981610 + cda0e48
commit 963fc22
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.github/actions/upsert-issue/dist/index.js b/.github/actions/upsert-issue/dist/index.js
@@ -326,7 +326,7 @@ function updateIssuePlan(issue, changes, title) {
                     }
                 }
                 if (!matchedSpec) {
-                    throw new Error('Bytebase disallow adding new migration file to the existing issue: ' + change.file);
+                    throw new Error(`Bytebase disallow adding new migration file to the existing issue: ${change.file}`);
                 }
             }
         }
@@ -384,7 +384,7 @@ function updateIssuePlan(issue, changes, title) {
                                 for (const task of stage.tasks) {
                                     if (change.id == task.specId) {
                                         if (!allowedStates.includes(task.status)) {
-                                            throw new Error('Can not update migration file. Task status ' + task.status + ' not in ' + allowedStates.toString() + ': ' + change.file);
+                                            throw new Error(`Can not update migration file: ${change.file}. Task status ${task.status} not in [${allowedStates.toString()}].`);
                                         }
                                     }
                                 }

diff --git a/.github/actions/upsert-issue/index.ts b/.github/actions/upsert-issue/index.ts
@@ -322,7 +322,7 @@ async function updateIssuePlan(issue: any, changes: Change[], title: string) : P
         }
       }
       if (!matchedSpec) {
-        throw new Error('Bytebase disallow adding new migration file to the existing issue: ' + change.file);
+        throw new Error(`Bytebase disallow adding new migration file to the existing issue: ${change.file}`);
       }
     }
   }
@@ -385,7 +385,7 @@ async function updateIssuePlan(issue: any, changes: Change[], title: string) : P
               for (const task of stage.tasks) {
                 if (change.id == task.specId) {
                   if (!allowedStates.includes(task.status)) {
-                    throw new Error('Can not update migration file. Task status ' + task.status + ' not in ' + allowedStates.toString() + ': ' + change.file);
+                    throw new Error(`Can not update migration file: ${change.file}. Task status ${task.status} not in [${allowedStates.toString()}].`);
                   }
                 }
               }