Draft of improvements on some odd things mentioned in rP20644.
Details
Details
Diff Detail
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Lint
Automatic diff as part of commit; lint not applicable. - Unit
Automatic diff as part of commit; unit tests not applicable.
Event Timeline
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (308 tests)....................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Updating workspaces... Build (release)... Build (debug)... Running release tests... Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK! Running debug tests... Running cxxtest tests (309 tests).....................................................................................................................................................................................................................................................................................................................OK! Checking XML files...
Comment Actions
Executing section Default... Executing section Source... Executing section JS... | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 2. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | 510| 510| Engine.GetGUIObjectByName("summaryText").caption = | 511| 511| g_GameData.gui.isInGame ? | 512| 512| translate("Current Scores") : | 513| |- g_GameData.gui.isReplay ? | | 513|+ g_GameData.gui.isReplay ? | 514| 514| translate("Scores at the end of the game.") : | 515| 515| g_GameData.gui.disconnected ? | 516| 516| translate("You have been disconnected.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 3. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | 511| 511| g_GameData.gui.isInGame ? | 512| 512| translate("Current Scores") : | 513| 513| g_GameData.gui.isReplay ? | 514| |- translate("Scores at the end of the game.") : | | 514|+ translate("Scores at the end of the game.") : | 515| 515| g_GameData.gui.disconnected ? | 516| 516| translate("You have been disconnected.") : | 517| 517| !assignedState ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 2. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | 512| 512| translate("Current Scores") : | 513| 513| g_GameData.gui.isReplay ? | 514| 514| translate("Scores at the end of the game.") : | 515| |- g_GameData.gui.disconnected ? | | 515|+ g_GameData.gui.disconnected ? | 516| 516| translate("You have been disconnected.") : | 517| 517| !assignedState ? | 518| 518| translate("You have left the game.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 3. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | 513| 513| g_GameData.gui.isReplay ? | 514| 514| translate("Scores at the end of the game.") : | 515| 515| g_GameData.gui.disconnected ? | 516| |- translate("You have been disconnected.") : | | 516|+ translate("You have been disconnected.") : | 517| 517| !assignedState ? | 518| 518| translate("You have left the game.") : | 519| 519| assignedState.state == "won" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 2. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | 514| 514| translate("Scores at the end of the game.") : | 515| 515| g_GameData.gui.disconnected ? | 516| 516| translate("You have been disconnected.") : | 517| |- !assignedState ? | | 517|+ !assignedState ? | 518| 518| translate("You have left the game.") : | 519| 519| assignedState.state == "won" ? | 520| 520| translate("You have won the battle!") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 3. |----| | /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | |++++| /mnt/data/jenkins-phabricator/workspace/phabricator_lint/binaries/data/mods/public/gui/summary/summary.js | 515| 515| g_GameData.gui.disconnected ? | 516| 516| translate("You have been disconnected.") : | 517| 517| !assignedState ? | 518|
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/vs2015-differential/1028/display/redirect
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Linter detected issues: Executing section Source... Executing section JS... | | [NORMAL] ESLintBear (indent): | | Expected indentation of 3 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 494| 494| Engine.GetGUIObjectByName("summaryText").caption = | 495| 495| g_GameData.gui.isInGame ? | 496| 496| translate("Current Scores") : | 497| |- g_GameData.gui.isReplay ? | | 497|+ g_GameData.gui.isReplay ? | 498| 498| translate("Scores at the end of the game.") : | 499| 499| g_GameData.gui.disconnected ? | 500| 500| translate("You have been disconnected.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 495| 495| g_GameData.gui.isInGame ? | 496| 496| translate("Current Scores") : | 497| 497| g_GameData.gui.isReplay ? | 498| |- translate("Scores at the end of the game.") : | | 498|+ translate("Scores at the end of the game.") : | 499| 499| g_GameData.gui.disconnected ? | 500| 500| translate("You have been disconnected.") : | 501| 501| !assignedState ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 4 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 496| 496| translate("Current Scores") : | 497| 497| g_GameData.gui.isReplay ? | 498| 498| translate("Scores at the end of the game.") : | 499| |- g_GameData.gui.disconnected ? | | 499|+ g_GameData.gui.disconnected ? | 500| 500| translate("You have been disconnected.") : | 501| 501| !assignedState ? | 502| 502| translate("You have left the game.") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 497| 497| g_GameData.gui.isReplay ? | 498| 498| translate("Scores at the end of the game.") : | 499| 499| g_GameData.gui.disconnected ? | 500| |- translate("You have been disconnected.") : | | 500|+ translate("You have been disconnected.") : | 501| 501| !assignedState ? | 502| 502| translate("You have left the game.") : | 503| 503| assignedState.state == "won" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 5 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 498| 498| translate("Scores at the end of the game.") : | 499| 499| g_GameData.gui.disconnected ? | 500| 500| translate("You have been disconnected.") : | 501| |- !assignedState ? | | 501|+ !assignedState ? | 502| 502| translate("You have left the game.") : | 503| 503| assignedState.state == "won" ? | 504| 504| translate("You have won the battle!") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 499| 499| g_GameData.gui.disconnected ? | 500| 500| translate("You have been disconnected.") : | 501| 501| !assignedState ? | 502| |- translate("You have left the game.") : | | 502|+ translate("You have left the game.") : | 503| 503| assignedState.state == "won" ? | 504| 504| translate("You have won the battle!") : | 505| 505| assignedState.state == "defeated" ? | | [NORMAL] ESLintBear (indent): | | Expected indentation of 6 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 500| 500| translate("You have been disconnected.") : | 501| 501| !assignedState ? | 502| 502| translate("You have left the game.") : | 503| |- assignedState.state == "won" ? | | 503|+ assignedState.state == "won" ? | 504| 504| translate("You have won the battle!") : | 505| 505| assignedState.state == "defeated" ? | 506| 506| translate("You have been defeated…") : | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 501| 501| !assignedState ? | 502| 502| translate("You have left the game.") : | 503| 503| assignedState.state == "won" ? | 504| |- translate("You have won the battle!") : | | 504|+ translate("You have won the battle!") : | 505| 505| assignedState.state == "defeated" ? | 506| 506| translate("You have been defeated…") : | 507| 507| translate("You have abandoned the game."); | | [NORMAL] ESLintBear (indent): | | Expected indentation of 7 tabs but found 2. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 502| 502| translate("You have left the game.") : | 503| 503| assignedState.state == "won" ? | 504| 504| translate("You have won the battle!") : | 505| |- assignedState.state == "defeated" ? | | 505|+ assignedState.state == "defeated" ? | 506| 506| translate("You have been defeated…") : | 507| 507| translate("You have abandoned the game."); | 508| 508| | | [NORMAL] ESLintBear (indent): | | Expected indentation of 8 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 503| 503| assignedState.state == "won" ? | 504| 504| translate("You have won the battle!") : | 505| 505| assignedState.state == "defeated" ? | 506| |- translate("You have been defeated…") : | | 506|+ translate("You have been defeated…") : | 507| 507| translate("You have abandoned the game."); | 508| 508| | 509| 509| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | | [NORMAL] ESLintBear (indent): | | Expected indentation of 8 tabs but found 3. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 504| 504| translate("You have won the battle!") : | 505| 505| assignedState.state == "defeated" ? | 506| 506| translate("You have been defeated…") : | 507| |- translate("You have abandoned the game."); | | 507|+ translate("You have abandoned the game."); | 508| 508| | 509| 509| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | 510| 510| translate("Game time elapsed: %(time)s"), { | | [NORMAL] ESLintBear (indent): | | Expected indentation of 2 tabs but found 1. |----| | /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | |++++| /zpool0/trunk/binaries/data/mods/public/gui/summary/summary.js | 509| 509| Engine.GetGUIObjectByName("timeElapsed").caption = sprintf( | 510| 510| translate("Game time elapsed: %(time)s"), { | 511| 511| "time": timeToString(g_GameData.sim.timeElapsed) | 512| |- }); | | 512|+ }); | 513| 513| | 514| 514| let mapType = g_Settings.MapTypes.find(type => type.Name == g_GameData.sim.mapSettings.mapType); | 515| 515| let mapSize = g_Settings.MapSizes.find(size => size.Tiles == g_GameData.sim.mapSettings.Size || 0); Executing section cli...
Link to build: https://jenkins.wildfiregames.com/job/docker-differential/1546/display/redirect
Comment Actions
Successful build - Chance fights ever on the side of the prudent.
Link to build: https://jenkins.wildfiregames.com/job/macos-differential/124/display/redirect