From 5fcb943cc15d70ab9a62953dec6a401c7272b373 Mon Sep 17 00:00:00 2001 From: bocharsky-bw Date: Sat, 15 Jun 2019 12:05:26 +0300 Subject: [PATCH] Tweak versioning and return back failing on CI --- .travis.yml | 3 +- public/build/{0.2375624d.js => 0.js} | 0 public/build/{1.734a5257.js => 1.js} | 0 public/build/{2.63838593.js => 2.js} | 0 .../build/{admin.5cc2ebf1.css => admin.css} | 0 public/build/{admin.74750e33.js => admin.js} | 0 public/build/{app.9f402dd6.css => app.css} | 0 public/build/{app.94e6145a.js => app.js} | 0 public/build/entrypoints.json | 54 +++++++++---------- public/build/{login.897801f7.js => login.js} | 0 public/build/manifest.json | 20 +++---- .../build/{runtime.26bd8744.js => runtime.js} | 0 .../build/{search.b34d41ab.js => search.js} | 0 symfony.lock | 18 +++++-- webpack.config.js | 6 ++- 15 files changed, 56 insertions(+), 45 deletions(-) rename public/build/{0.2375624d.js => 0.js} (100%) rename public/build/{1.734a5257.js => 1.js} (100%) rename public/build/{2.63838593.js => 2.js} (100%) rename public/build/{admin.5cc2ebf1.css => admin.css} (100%) rename public/build/{admin.74750e33.js => admin.js} (100%) rename public/build/{app.9f402dd6.css => app.css} (100%) rename public/build/{app.94e6145a.js => app.js} (100%) rename public/build/{login.897801f7.js => login.js} (100%) rename public/build/{runtime.26bd8744.js => runtime.js} (100%) rename public/build/{search.b34d41ab.js => search.js} (100%) diff --git a/.travis.yml b/.travis.yml index 972fde5f1..aa7a7342a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,5 +46,4 @@ script: # this checks that Doctrine's mapping configurations are valid - ./bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction # Fail CI if the repo is in a dirty state after building assets - # (disabled until we can find the reason why it fails randomly) - #- yarn install && yarn encore production && git add --all && git diff --staged --shortstat --exit-code + - yarn install && yarn encore production && git add --all && git diff --staged --exit-code diff --git a/public/build/0.2375624d.js b/public/build/0.js similarity index 100% rename from public/build/0.2375624d.js rename to public/build/0.js diff --git a/public/build/1.734a5257.js b/public/build/1.js similarity index 100% rename from public/build/1.734a5257.js rename to public/build/1.js diff --git a/public/build/2.63838593.js b/public/build/2.js similarity index 100% rename from public/build/2.63838593.js rename to public/build/2.js diff --git a/public/build/admin.5cc2ebf1.css b/public/build/admin.css similarity index 100% rename from public/build/admin.5cc2ebf1.css rename to public/build/admin.css diff --git a/public/build/admin.74750e33.js b/public/build/admin.js similarity index 100% rename from public/build/admin.74750e33.js rename to public/build/admin.js diff --git a/public/build/app.9f402dd6.css b/public/build/app.css similarity index 100% rename from public/build/app.9f402dd6.css rename to public/build/app.css diff --git a/public/build/app.94e6145a.js b/public/build/app.js similarity index 100% rename from public/build/app.94e6145a.js rename to public/build/app.js diff --git a/public/build/entrypoints.json b/public/build/entrypoints.json index 437961730..effa82a7b 100644 --- a/public/build/entrypoints.json +++ b/public/build/entrypoints.json @@ -2,52 +2,52 @@ "entrypoints": { "app": { "js": [ - "/build/runtime.26bd8744.js", - "/build/0.2375624d.js", - "/build/1.734a5257.js", - "/build/app.94e6145a.js" + "/build/runtime.js", + "/build/0.js", + "/build/1.js", + "/build/app.js" ], "css": [ - "/build/app.9f402dd6.css" + "/build/app.css" ] }, "login": { "js": [ - "/build/runtime.26bd8744.js", - "/build/0.2375624d.js", - "/build/login.897801f7.js" + "/build/runtime.js", + "/build/0.js", + "/build/login.js" ] }, "admin": { "js": [ - "/build/runtime.26bd8744.js", - "/build/0.2375624d.js", - "/build/2.63838593.js", - "/build/admin.74750e33.js" + "/build/runtime.js", + "/build/0.js", + "/build/2.js", + "/build/admin.js" ], "css": [ - "/build/admin.5cc2ebf1.css" + "/build/admin.css" ] }, "search": { "js": [ - "/build/runtime.26bd8744.js", - "/build/0.2375624d.js", - "/build/1.734a5257.js", - "/build/search.b34d41ab.js" + "/build/runtime.js", + "/build/0.js", + "/build/1.js", + "/build/search.js" ] } }, "integrity": { - "/build/runtime.26bd8744.js": "sha384-5WSgDNxkAY6j6/bzAcp3v//+PCXLgXCU3u5QgRXWiRfMnN4Ic/a/EF6HJnbRXik8", - "/build/0.2375624d.js": "sha384-jDIhKUnvFIslPqAgXgRKPtCGahSHPauPtdEjjHQ4sZRIXz01QgRddKg44c9tOVcQ", - "/build/1.734a5257.js": "sha384-218Po/nLHQljJlGMju/WIPaBbprLrYg6uyyARYbkybHLTUQGZDCCuGSB2wmRELEW", - "/build/app.94e6145a.js": "sha384-XhAG/I1VVL0admGT0ZEDTYdabB0STMzZsYPkZ6mrmQhDUCe66ldCHnwTTWX069rz", - "/build/app.9f402dd6.css": "sha384-mSGbxUu/Q9Hbd/Gu2rYyk0Y8uUFWfPa8N0zP1E1f0E7lvWbQ//00E6k3v84Mm0Hw", - "/build/login.897801f7.js": "sha384-AnahE1JksyOZbxe/Gdg1twmMPucW4F1llK9OftiRo/Ud2L1ShQPtBLuN4MoCLb0f", - "/build/2.63838593.js": "sha384-35yx4m4fx1SoFdyvzGO0FqsakDLnulOzdlePL4weeYAcN14ldjFk+csCLqGig08d", - "/build/admin.74750e33.js": "sha384-JmniyJIvI0RiH0zMq2m2D7Q/6gKy5d3UKXu62YetvnV5MdxfbJWhWeNBB2umxtwE", - "/build/admin.5cc2ebf1.css": "sha384-ilLLAgcQxfeIVl6jV3AsZ2jmrWwgECQptl9HYwqc2NpYuTl6FEW46DBpDk5Q76sp", - "/build/search.b34d41ab.js": "sha384-JszEQKXXaNJvTHGGLCrf1OLfn37YYH0LKq2SNZg3D97Qs1LRXd8YRqaNuEwjACqQ" + "/build/runtime.js": "sha384-5WSgDNxkAY6j6/bzAcp3v//+PCXLgXCU3u5QgRXWiRfMnN4Ic/a/EF6HJnbRXik8", + "/build/0.js": "sha384-jDIhKUnvFIslPqAgXgRKPtCGahSHPauPtdEjjHQ4sZRIXz01QgRddKg44c9tOVcQ", + "/build/1.js": "sha384-218Po/nLHQljJlGMju/WIPaBbprLrYg6uyyARYbkybHLTUQGZDCCuGSB2wmRELEW", + "/build/app.js": "sha384-XhAG/I1VVL0admGT0ZEDTYdabB0STMzZsYPkZ6mrmQhDUCe66ldCHnwTTWX069rz", + "/build/app.css": "sha384-mSGbxUu/Q9Hbd/Gu2rYyk0Y8uUFWfPa8N0zP1E1f0E7lvWbQ//00E6k3v84Mm0Hw", + "/build/login.js": "sha384-AnahE1JksyOZbxe/Gdg1twmMPucW4F1llK9OftiRo/Ud2L1ShQPtBLuN4MoCLb0f", + "/build/2.js": "sha384-35yx4m4fx1SoFdyvzGO0FqsakDLnulOzdlePL4weeYAcN14ldjFk+csCLqGig08d", + "/build/admin.js": "sha384-JmniyJIvI0RiH0zMq2m2D7Q/6gKy5d3UKXu62YetvnV5MdxfbJWhWeNBB2umxtwE", + "/build/admin.css": "sha384-ilLLAgcQxfeIVl6jV3AsZ2jmrWwgECQptl9HYwqc2NpYuTl6FEW46DBpDk5Q76sp", + "/build/search.js": "sha384-JszEQKXXaNJvTHGGLCrf1OLfn37YYH0LKq2SNZg3D97Qs1LRXd8YRqaNuEwjACqQ" } } \ No newline at end of file diff --git a/public/build/login.897801f7.js b/public/build/login.js similarity index 100% rename from public/build/login.897801f7.js rename to public/build/login.js diff --git a/public/build/manifest.json b/public/build/manifest.json index bcac12136..4d479009b 100644 --- a/public/build/manifest.json +++ b/public/build/manifest.json @@ -1,14 +1,14 @@ { - "build/0.2375624d.js": "/build/0.2375624d.js", - "build/1.734a5257.js": "/build/1.734a5257.js", - "build/2.63838593.js": "/build/2.63838593.js", - "build/admin.css": "/build/admin.5cc2ebf1.css", - "build/admin.js": "/build/admin.74750e33.js", - "build/app.css": "/build/app.9f402dd6.css", - "build/app.js": "/build/app.94e6145a.js", - "build/login.js": "/build/login.897801f7.js", - "build/runtime.js": "/build/runtime.26bd8744.js", - "build/search.js": "/build/search.b34d41ab.js", + "build/0.js": "/build/0.js", + "build/1.js": "/build/1.js", + "build/2.js": "/build/2.js", + "build/admin.css": "/build/admin.css", + "build/admin.js": "/build/admin.js", + "build/app.css": "/build/app.css", + "build/app.js": "/build/app.js", + "build/login.js": "/build/login.js", + "build/runtime.js": "/build/runtime.js", + "build/search.js": "/build/search.js", "build/fonts/fa-brands-400.eot": "/build/fonts/fa-brands-400.8e49b728.eot", "build/fonts/fa-brands-400.woff": "/build/fonts/fa-brands-400.9f018d10.woff", "build/fonts/fa-brands-400.woff2": "/build/fonts/fa-brands-400.9f4ce3dc.woff2", diff --git a/public/build/runtime.26bd8744.js b/public/build/runtime.js similarity index 100% rename from public/build/runtime.26bd8744.js rename to public/build/runtime.js diff --git a/public/build/search.b34d41ab.js b/public/build/search.js similarity index 100% rename from public/build/search.b34d41ab.js rename to public/build/search.js diff --git a/symfony.lock b/symfony.lock index 81147806a..ada83e7b0 100644 --- a/symfony.lock +++ b/symfony.lock @@ -69,7 +69,11 @@ "branch": "master", "version": "1.2", "ref": "c1431086fec31f17fbcfe6d6d7e92059458facc1" - } + }, + "files": [ + "config/packages/doctrine_migrations.yaml", + "src/Migrations/.gitignore" + ] }, "doctrine/event-manager": { "version": "1.0.x-dev" @@ -84,7 +88,7 @@ "version": "1.0.x-dev" }, "doctrine/migrations": { - "version": "1.8.x-dev" + "version": "v1.8.1" }, "doctrine/orm": { "version": "2.7.x-dev" @@ -125,8 +129,11 @@ "nikic/php-parser": { "version": "v4.2.1" }, + "ocramius/package-versions": { + "version": "1.4.0" + }, "ocramius/proxy-manager": { - "version": "2.1.x-dev" + "version": "2.1.1" }, "paragonie/random_compat": { "version": "v9.99.99.x-dev" @@ -471,6 +478,9 @@ "version": "2.x-dev" }, "zendframework/zend-code": { - "version": "3.3-dev" + "version": "3.3.1" + }, + "zendframework/zend-eventmanager": { + "version": "3.2.1" } } diff --git a/webpack.config.js b/webpack.config.js index 459b352b3..a67e66fbb 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -16,14 +16,16 @@ Encore "jQuery.tagsinput": "bootstrap-tagsinput" }) .enableSassLoader() - .enableVersioning(Encore.isProduction()) + // Disable versioning to be able to check if assets are fresh on CI. + // Use Encore.isProduction() to enable it only for production. + .enableVersioning(false) .addEntry('app', './assets/js/app.js') .addEntry('login', './assets/js/login.js') .addEntry('admin', './assets/js/admin.js') .addEntry('search', './assets/js/search.js') .splitEntryChunks() .enableSingleRuntimeChunk() - .enableIntegrityHashes() + .enableIntegrityHashes(Encore.isProduction()) .configureBabel(null, { useBuiltIns: 'usage', corejs: 3,