Skip to content

Commit 46fe82f

Browse files
committed
feature #1004 Tweak versioning and return back failing on CI (bocharsky-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
2 parents 9b365c2 + 5fcb943 commit 46fe82f

15 files changed

+56
-45
lines changed

.travis.yml

+1-2
Original file line numberDiff line numberDiff line change
@@ -46,5 +46,4 @@ script:
4646
# this checks that Doctrine's mapping configurations are valid
4747
- ./bin/console doctrine:schema:validate --skip-sync -vvv --no-interaction
4848
# Fail CI if the repo is in a dirty state after building assets
49-
# (disabled until we can find the reason why it fails randomly)
50-
#- yarn install && yarn encore production && git add --all && git diff --staged --shortstat --exit-code
49+
- 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.

public/build/entrypoints.json

+27-27
Original file line numberDiff line numberDiff line change
@@ -2,52 +2,52 @@
22
"entrypoints": {
33
"app": {
44
"js": [
5-
"/build/runtime.26bd8744.js",
6-
"/build/0.2375624d.js",
7-
"/build/1.734a5257.js",
8-
"/build/app.94e6145a.js"
5+
"/build/runtime.js",
6+
"/build/0.js",
7+
"/build/1.js",
8+
"/build/app.js"
99
],
1010
"css": [
11-
"/build/app.9f402dd6.css"
11+
"/build/app.css"
1212
]
1313
},
1414
"login": {
1515
"js": [
16-
"/build/runtime.26bd8744.js",
17-
"/build/0.2375624d.js",
18-
"/build/login.897801f7.js"
16+
"/build/runtime.js",
17+
"/build/0.js",
18+
"/build/login.js"
1919
]
2020
},
2121
"admin": {
2222
"js": [
23-
"/build/runtime.26bd8744.js",
24-
"/build/0.2375624d.js",
25-
"/build/2.63838593.js",
26-
"/build/admin.74750e33.js"
23+
"/build/runtime.js",
24+
"/build/0.js",
25+
"/build/2.js",
26+
"/build/admin.js"
2727
],
2828
"css": [
29-
"/build/admin.5cc2ebf1.css"
29+
"/build/admin.css"
3030
]
3131
},
3232
"search": {
3333
"js": [
34-
"/build/runtime.26bd8744.js",
35-
"/build/0.2375624d.js",
36-
"/build/1.734a5257.js",
37-
"/build/search.b34d41ab.js"
34+
"/build/runtime.js",
35+
"/build/0.js",
36+
"/build/1.js",
37+
"/build/search.js"
3838
]
3939
}
4040
},
4141
"integrity": {
42-
"/build/runtime.26bd8744.js": "sha384-5WSgDNxkAY6j6/bzAcp3v//+PCXLgXCU3u5QgRXWiRfMnN4Ic/a/EF6HJnbRXik8",
43-
"/build/0.2375624d.js": "sha384-jDIhKUnvFIslPqAgXgRKPtCGahSHPauPtdEjjHQ4sZRIXz01QgRddKg44c9tOVcQ",
44-
"/build/1.734a5257.js": "sha384-218Po/nLHQljJlGMju/WIPaBbprLrYg6uyyARYbkybHLTUQGZDCCuGSB2wmRELEW",
45-
"/build/app.94e6145a.js": "sha384-XhAG/I1VVL0admGT0ZEDTYdabB0STMzZsYPkZ6mrmQhDUCe66ldCHnwTTWX069rz",
46-
"/build/app.9f402dd6.css": "sha384-mSGbxUu/Q9Hbd/Gu2rYyk0Y8uUFWfPa8N0zP1E1f0E7lvWbQ//00E6k3v84Mm0Hw",
47-
"/build/login.897801f7.js": "sha384-AnahE1JksyOZbxe/Gdg1twmMPucW4F1llK9OftiRo/Ud2L1ShQPtBLuN4MoCLb0f",
48-
"/build/2.63838593.js": "sha384-35yx4m4fx1SoFdyvzGO0FqsakDLnulOzdlePL4weeYAcN14ldjFk+csCLqGig08d",
49-
"/build/admin.74750e33.js": "sha384-JmniyJIvI0RiH0zMq2m2D7Q/6gKy5d3UKXu62YetvnV5MdxfbJWhWeNBB2umxtwE",
50-
"/build/admin.5cc2ebf1.css": "sha384-ilLLAgcQxfeIVl6jV3AsZ2jmrWwgECQptl9HYwqc2NpYuTl6FEW46DBpDk5Q76sp",
51-
"/build/search.b34d41ab.js": "sha384-JszEQKXXaNJvTHGGLCrf1OLfn37YYH0LKq2SNZg3D97Qs1LRXd8YRqaNuEwjACqQ"
42+
"/build/runtime.js": "sha384-5WSgDNxkAY6j6/bzAcp3v//+PCXLgXCU3u5QgRXWiRfMnN4Ic/a/EF6HJnbRXik8",
43+
"/build/0.js": "sha384-jDIhKUnvFIslPqAgXgRKPtCGahSHPauPtdEjjHQ4sZRIXz01QgRddKg44c9tOVcQ",
44+
"/build/1.js": "sha384-218Po/nLHQljJlGMju/WIPaBbprLrYg6uyyARYbkybHLTUQGZDCCuGSB2wmRELEW",
45+
"/build/app.js": "sha384-XhAG/I1VVL0admGT0ZEDTYdabB0STMzZsYPkZ6mrmQhDUCe66ldCHnwTTWX069rz",
46+
"/build/app.css": "sha384-mSGbxUu/Q9Hbd/Gu2rYyk0Y8uUFWfPa8N0zP1E1f0E7lvWbQ//00E6k3v84Mm0Hw",
47+
"/build/login.js": "sha384-AnahE1JksyOZbxe/Gdg1twmMPucW4F1llK9OftiRo/Ud2L1ShQPtBLuN4MoCLb0f",
48+
"/build/2.js": "sha384-35yx4m4fx1SoFdyvzGO0FqsakDLnulOzdlePL4weeYAcN14ldjFk+csCLqGig08d",
49+
"/build/admin.js": "sha384-JmniyJIvI0RiH0zMq2m2D7Q/6gKy5d3UKXu62YetvnV5MdxfbJWhWeNBB2umxtwE",
50+
"/build/admin.css": "sha384-ilLLAgcQxfeIVl6jV3AsZ2jmrWwgECQptl9HYwqc2NpYuTl6FEW46DBpDk5Q76sp",
51+
"/build/search.js": "sha384-JszEQKXXaNJvTHGGLCrf1OLfn37YYH0LKq2SNZg3D97Qs1LRXd8YRqaNuEwjACqQ"
5252
}
5353
}
File renamed without changes.

public/build/manifest.json

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
2-
"build/0.2375624d.js": "/build/0.2375624d.js",
3-
"build/1.734a5257.js": "/build/1.734a5257.js",
4-
"build/2.63838593.js": "/build/2.63838593.js",
5-
"build/admin.css": "/build/admin.5cc2ebf1.css",
6-
"build/admin.js": "/build/admin.74750e33.js",
7-
"build/app.css": "/build/app.9f402dd6.css",
8-
"build/app.js": "/build/app.94e6145a.js",
9-
"build/login.js": "/build/login.897801f7.js",
10-
"build/runtime.js": "/build/runtime.26bd8744.js",
11-
"build/search.js": "/build/search.b34d41ab.js",
2+
"build/0.js": "/build/0.js",
3+
"build/1.js": "/build/1.js",
4+
"build/2.js": "/build/2.js",
5+
"build/admin.css": "/build/admin.css",
6+
"build/admin.js": "/build/admin.js",
7+
"build/app.css": "/build/app.css",
8+
"build/app.js": "/build/app.js",
9+
"build/login.js": "/build/login.js",
10+
"build/runtime.js": "/build/runtime.js",
11+
"build/search.js": "/build/search.js",
1212
"build/fonts/fa-brands-400.eot": "/build/fonts/fa-brands-400.8e49b728.eot",
1313
"build/fonts/fa-brands-400.woff": "/build/fonts/fa-brands-400.9f018d10.woff",
1414
"build/fonts/fa-brands-400.woff2": "/build/fonts/fa-brands-400.9f4ce3dc.woff2",
File renamed without changes.
File renamed without changes.

symfony.lock

+14-4
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,11 @@
6969
"branch": "master",
7070
"version": "1.2",
7171
"ref": "c1431086fec31f17fbcfe6d6d7e92059458facc1"
72-
}
72+
},
73+
"files": [
74+
"config/packages/doctrine_migrations.yaml",
75+
"src/Migrations/.gitignore"
76+
]
7377
},
7478
"doctrine/event-manager": {
7579
"version": "1.0.x-dev"
@@ -84,7 +88,7 @@
8488
"version": "1.0.x-dev"
8589
},
8690
"doctrine/migrations": {
87-
"version": "1.8.x-dev"
91+
"version": "v1.8.1"
8892
},
8993
"doctrine/orm": {
9094
"version": "2.7.x-dev"
@@ -125,8 +129,11 @@
125129
"nikic/php-parser": {
126130
"version": "v4.2.1"
127131
},
132+
"ocramius/package-versions": {
133+
"version": "1.4.0"
134+
},
128135
"ocramius/proxy-manager": {
129-
"version": "2.1.x-dev"
136+
"version": "2.1.1"
130137
},
131138
"paragonie/random_compat": {
132139
"version": "v9.99.99.x-dev"
@@ -471,6 +478,9 @@
471478
"version": "2.x-dev"
472479
},
473480
"zendframework/zend-code": {
474-
"version": "3.3-dev"
481+
"version": "3.3.1"
482+
},
483+
"zendframework/zend-eventmanager": {
484+
"version": "3.2.1"
475485
}
476486
}

webpack.config.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,16 @@ Encore
1616
"jQuery.tagsinput": "bootstrap-tagsinput"
1717
})
1818
.enableSassLoader()
19-
.enableVersioning(Encore.isProduction())
19+
// Disable versioning to be able to check if assets are fresh on CI.
20+
// Use Encore.isProduction() to enable it only for production.
21+
.enableVersioning(false)
2022
.addEntry('app', './assets/js/app.js')
2123
.addEntry('login', './assets/js/login.js')
2224
.addEntry('admin', './assets/js/admin.js')
2325
.addEntry('search', './assets/js/search.js')
2426
.splitEntryChunks()
2527
.enableSingleRuntimeChunk()
26-
.enableIntegrityHashes()
28+
.enableIntegrityHashes(Encore.isProduction())
2729
.configureBabel(null, {
2830
useBuiltIns: 'usage',
2931
corejs: 3,

0 commit comments

Comments
 (0)