Skip to content

Commit

Permalink
feature #1004 Tweak versioning and return back failing on CI (bochars…
Browse files Browse the repository at this point in the history
…ky-bw)

This PR was squashed before being merged into the master branch (closes #1004).

Discussion
----------

Tweak versioning and return back failing on CI

A possible fix for: #994 (comment)

Commits
-------

5fcb943 Tweak versioning and return back failing on CI
  • Loading branch information
javiereguiluz committed Jun 25, 2019
2 parents 9b365c2 + 5fcb943 commit 46fe82f
Show file tree
Hide file tree
Showing 15 changed files with 56 additions and 45 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
54 changes: 27 additions & 27 deletions public/build/entrypoints.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
File renamed without changes.
20 changes: 10 additions & 10 deletions public/build/manifest.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
File renamed without changes.
File renamed without changes.
18 changes: 14 additions & 4 deletions symfony.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
}
}
6 changes: 4 additions & 2 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 46fe82f

Please sign in to comment.