diff --git a/Makefile b/Makefile index 9d1130612acff5296b99c5fc8a4429f7f0d6ea4e..51424f906cf5b58dd9b5d72db30ca2b787f7824b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,6 @@ include ./config/path.makefile -GULP = ./node_modules/gulp/bin/gulp.js +GULP = node ./node_modules/gulp/bin/gulp.js +FLYWAY = flyway -configFile=config/db.makefile default: deploy @ @@ -13,6 +14,9 @@ install: DB_install Tasker_deploy deploy: DB_deploy Tasker_deploy $(GULP) +fw_deploy: fw_migrate Tasker_deploy + $(GULP) + # copy server files copy_files: Tasker_deploy $(GULP) --release --force @@ -32,13 +36,23 @@ release: DB_update release_no_db # server deploy with dump load load_deploy: DB_deployTest copy_files - # ----------------------- # Tasker section Tasker_deploy: npm install +# ----------------------- +# Flyway +fw_info: + $(FLYWAY) info + +fw_clean: + $(FLYWAY) clean + +fw_migrate: + $(FLYWAY) migrate + # ----------------------- # database forwarding diff --git a/db/migrations/structure/V1_7__tables_MMCSRatingReports.sql b/db/migrations/structure/V1_1_1__tables_MMCSRatingReports.sql similarity index 100% rename from db/migrations/structure/V1_7__tables_MMCSRatingReports.sql rename to db/migrations/structure/V1_1_1__tables_MMCSRatingReports.sql