Commit Graph

44 Commits

Author SHA1 Message Date
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
jeff newquist
5ea7789d60 Rename UE4CommandLine.txt to UECommandLine.txt and deal with all the related changes
#rb TBD
#jira UE-113713

[CL 16093056 by jeff newquist in ue5-main branch]
2021-04-22 10:29:26 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
Marc Audy
9753392e2b Merge UE5/RES CL# 15462083 to UE5/Main
This represents UE4/Main @ 15414221

[CL 15463811 by Marc Audy in ue5-main branch]
2021-02-18 18:13:28 -04:00
Chris Babcock
0cfc6e0653 Fix non-deterministic use of GetHashCode() in UBT and Gauntlet
#jira none
#review @Ben.Marsh
#rb Ben.Marsh
#rnx

[CL 15218197 by Chris Babcock in ue5-main branch]
2021-01-27 13:06:37 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Ben Marsh
03675533ea Rename UE4Game -> UnrealGame, UE4Client -> UnrealClient, UE4Server -> UnrealServer.
Mostly a find/replace, though I have looked through the changes and attempted to update references to other things as necessary (eg. renaming IOS plist files for IOS). I'm not set up to test on any platforms other than windows, and was hoping to get your blessing to submit and give QA enough time as possible to uncover issues before the next milestone release.

Particular things that I know I'm not sure about:
- Android references /UE4Game/ paths everywhere (for paths on device, I think). I have no idea if I've got them all.
- I've renamed the iOS mobileprovisions, but I don't know if they need regenerating for the new app name.
- Likewise, not sure what needs to be updated for icon bundles on iOS.

Things that have not been changed:
- Windows still uses IDI_UE4ICON for its icon
- UE4CommandLine.txt
- There's still a UE4Game module which is used by content-only projects

#rb none

[CL 14301890 by Ben Marsh in ue5-main branch]
2020-09-11 15:54:42 -04:00
andrew grant
65ec5074e4 Fix for Android builds not being discovered in Gauntlet
- Typo where when trying to remove 32-bit Android builds in favor of 64-bit builds we were setting them back to 32-bit.

#rb na
[FYI] josh.engebretson

#ROBOMERGE-SOURCE: CL 13062275 via CL 13062276 via CL 13062278 via CL 13062280
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13062281 by andrew grant in Main branch]
2020-04-28 21:21:57 -04:00
andrew grant
e89e3869ab Fixes Gauntlet support for 32-bit Android builds.
- Now use utils to pull build information instead of a custom regex.
- 32-bit builds are considered, but discarded if 64-bit versions are also present

[at]josh.engebretson
#jira nojira #rb na

#ROBOMERGE-SOURCE: CL 11610010 in //UE4/Release-4.25/... via CL 11610013
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v655-11596533)

[CL 11610034 by andrew grant in Main branch]
2020-02-25 13:05:03 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
daniel lamb
a06470aadb Gauntlet android build searching now correctly parses install directories.
Ben.Salem,Josh.Engebretson


#ROBOMERGE-SOURCE: CL 10613008 via CL 10613729
#ROBOMERGE-BOT: (v608-10590470)

[CL 10613832 by daniel lamb in Main branch]
2019-12-09 13:53:36 -05:00
andrew grant
8e51524156 Gauntlet - fixed exceptions that could occur when certain platforms don't exist on a system
[CODEREVIEW] josh.engbretson
#jira nojira
#rb na
#tests ran with & without Xbox & Switch folders present
#lockdown nick.penwarden

#ROBOMERGE-SOURCE: CL 10481079 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v605-10478255)

[CL 10481080 by andrew grant in Main branch]
2019-11-29 21:00:10 -05:00
josh engebretson
265cfa07cb Gauntlet: Fix issue with non-bulk test configuration ue4commandline.txt and log location on Android
[FYI] justin.marcus


#ROBOMERGE-SOURCE: CL 9574907 via CL 9575495 via CL 9575521
#ROBOMERGE-BOT: (v524-9564021)

[CL 9575556 by josh engebretson in Main branch]
2019-10-14 16:27:38 -04:00
josh engebretson
968fb3aef7 Gauntlet: Add some additional android verbose logging to help diagnose issues
#rnx


#ROBOMERGE-SOURCE: CL 9141023 via CL 9141062 via CL 9141075
#ROBOMERGE-BOT: (v443-9013191)

[CL 9141109 by josh engebretson in Main branch]
2019-09-26 10:54:03 -04:00
josh engebretson
1d17cafe25 Fix issue with mobile build builds being used regardless of -bulk being specified, log warning when fail to mark directory for cleanup
#rnx


#ROBOMERGE-SOURCE: CL 8995633 via CL 8995675 via CL 8995683
#ROBOMERGE-BOT: (v442-8990807)

[CL 8997070 by josh engebretson in Main branch]
2019-09-23 17:19:02 -04:00
josh engebretson
67417fb8cf Gauntlet: Fix issue pulling Android installs from from patch files
#rnx
[FYI] Daniel.Lamb


#ROBOMERGE-SOURCE: CL 8889905 via CL 8889908 via CL 8889910
#ROBOMERGE-BOT: (v427-8887818)

[CL 8890572 by josh engebretson in Main branch]
2019-09-19 12:44:55 -04:00
josh engebretson
c3c7ad017d Gauntlet: Fix issue with Android saved path (verified adb version unrelated)
#rnx
[FYI] justin.marcus, clayton.langford


#ROBOMERGE-SOURCE: CL 8119240 via CL 8119242 via CL 8123045
#ROBOMERGE-BOT: (v401-8057353)

[CL 8124771 by josh engebretson in Main branch]
2019-08-20 09:59:47 -04:00
justin marcus
900a40be3d Fix android artifacts being saved to the wrong directory.
[at]Josh.Engebretson


#ROBOMERGE-SOURCE: CL 7951960 via CL 7951966 via CL 7951969 via CL 7954680
#ROBOMERGE-BOT: (v393-7951996)

[CL 7954841 by justin marcus in Main branch]
2019-08-12 18:11:12 -04:00
justin marcus
11b919aab1 Fix Gauntlet always recopying obb's to target device. This seem to only happen when running locally and was caused by whitespace not being trimmed from the file names after parsing 'ls' results from ADB. Since this hasn't been seen on the test farm, I'm think this has to be a device specific or maybe a Windows/Linux isse.
[at]Josh.Engebretson


#ROBOMERGE-SOURCE: CL 7883158 via CL 7883183 via CL 7883188 via CL 7915274
#ROBOMERGE-BOT: (v389-7813075)

[CL 7915496 by justin marcus in Main branch]
2019-08-08 23:38:17 -04:00
william ewen
8d83ff0cca Gauntlet: Adding "NotBulk" flag, so we can specifically exclude bulk builds if we wish to
#rb Andrew.Grant
#rnx


#ROBOMERGE-SOURCE: CL 7651008 via CL 7654234
#ROBOMERGE-BOT: (v372-7473910)

[CL 7654408 by william ewen in Main branch]
2019-07-29 17:39:09 -04:00
josh engebretson
0f476aacac Gauntlet: sleep thread once Android activity has exited to allow for log to flush (speculative fix)
#rnx


#ROBOMERGE-SOURCE: CL 7094795 via CL 7094807 via CL 7105316
#ROBOMERGE-BOT: (v367-6836689)

[CL 7105348 by josh engebretson in Main branch]
2019-06-20 11:09:36 -04:00