Merge pull request pkp#657 from jonasraoni/bugfix/stable-3_4_0/9833-f…

…ix-preflight-check Bugfix/stable 3 4 0/9833 fix preflight check
withanage · Apr 12, 2024 · 740fd9d · 740fd9d
2 parents d9532ac + 3aaec6a
commit 740fd9d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -90,6 +90,7 @@ jobs:
         - patch -p1 < datasets/upgrade/3_4_0-add-email-config.diff
         - patch -p1 < datasets/upgrade/3_4_0-update-locale.diff
         - ./datasets/tools/dbclient.sh < datasets/${APPLICATION}/${DATASET_BRANCH}/${TEST}/database.sql
+        - source ./lib/pkp/tools/travis/migration/v3_4_0/prepare-logs.sh
         - php tools/upgrade.php check
         - php tools/upgrade.php upgrade
 
@@ -104,6 +105,7 @@ jobs:
         - patch -p1 < datasets/upgrade/3_4_0-add-email-config.diff
         - patch -p1 < datasets/upgrade/3_4_0-update-locale.diff
         - ./datasets/tools/dbclient.sh < datasets/${APPLICATION}/${DATASET_BRANCH}/${TEST}/database.sql
+        - source ./lib/pkp/tools/travis/migration/v3_4_0/prepare-logs.sh
         - php tools/upgrade.php check
         - php tools/upgrade.php upgrade
 
@@ -118,6 +120,7 @@ jobs:
         - patch -p1 < datasets/upgrade/3_4_0-add-email-config.diff
         - patch -p1 < datasets/upgrade/3_4_0-update-locale.diff
         - ./datasets/tools/dbclient.sh < datasets/${APPLICATION}/${DATASET_BRANCH}/${TEST}/database.sql
+        - source ./lib/pkp/tools/travis/migration/v3_4_0/prepare-logs.sh
         - php tools/upgrade.php check
         - php tools/upgrade.php upgrade
 
@@ -132,6 +135,7 @@ jobs:
         - patch -p1 < datasets/upgrade/3_4_0-add-email-config.diff
         - patch -p1 < datasets/upgrade/3_4_0-update-locale.diff
         - ./datasets/tools/dbclient.sh < datasets/${APPLICATION}/${DATASET_BRANCH}/${TEST}/database.sql
+        - source ./lib/pkp/tools/travis/migration/v3_4_0/prepare-logs.sh
         - php tools/upgrade.php check
         - php tools/upgrade.php upgrade
 
@@ -146,6 +150,7 @@ jobs:
         - patch -p1 < datasets/upgrade/3_4_0-add-email-config.diff
         - patch -p1 < datasets/upgrade/3_4_0-update-locale.diff
         - ./datasets/tools/dbclient.sh < datasets/${APPLICATION}/${DATASET_BRANCH}/${TEST}/database.sql
+        - source ./lib/pkp/tools/travis/migration/v3_4_0/prepare-logs.sh
         - php tools/upgrade.php check
         - php tools/upgrade.php upgrade
 
@@ -160,6 +165,7 @@ jobs:
         - patch -p1 < datasets/upgrade/3_4_0-add-email-config.diff
         - patch -p1 < datasets/upgrade/3_4_0-update-locale.diff
         - ./datasets/tools/dbclient.sh < datasets/${APPLICATION}/${DATASET_BRANCH}/${TEST}/database.sql
+        - source ./lib/pkp/tools/travis/migration/v3_4_0/prepare-logs.sh
         - php tools/upgrade.php check
         - php tools/upgrade.php upgrade
 

diff --git a/lib/pkp b/lib/pkp
+3 −4		classes/announcement/Repository.php
+1 −1		classes/author/Repository.php
+3 −4		classes/highlight/Repository.php
+5 −2		classes/migration/upgrade/v3_4_0/PreflightCheckMigration.php
+2 −2		controllers/grid/users/stageParticipant/form/AddParticipantForm.php
+1 −1		locale/pt_BR/submission.po
+1 −4		pages/login/LoginHandler.php
+37 −0		tools/travis/migration/v3_4_0/prepare-logs.sh