Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1d121c9
Code and config changes to update UE to 4.26
vinhowe Jan 20, 2021
202144e
Rebuild assets for 4.26
vinhowe Jan 20, 2021
732605c
Merge remote-tracking branch 'origin/pawn-fix' into 4.26
vinhowe Jan 21, 2021
180cb4e
Changes to make 4.26 Linux compiler happy
vinhowe Jan 21, 2021
5266f8f
Merge branch '4.26' of github.com:BYU-PCCL/holodeck-engine into 4.26
vinhowe Jan 21, 2021
0114872
Target C++17
vinhowe Jan 27, 2021
b3a399b
Merge branch 'develop' into 4.26
vinhowe Jan 29, 2021
7916a35
Merge branch 'develop' into 4.26
vinhowe Apr 29, 2021
03717a7
Fix formatting in Holodeck.Target.cs
vinhowe Apr 29, 2021
995783a
Only change CppStandard on Unix because it doesn't build on Windows
vinhowe Apr 29, 2021
08c0cef
Set up CI with Azure Pipelines
vinhowe May 3, 2021
d739fb1
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
ffe14a8
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
d04b1ed
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
f106516
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
6001154
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
d909aa4
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
a2f9ad7
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
4fce918
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
873091d
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 4, 2021
2616c77
Merge branch '4.26' into azure-pipelines
vinhowe May 4, 2021
feb9c7b
Update directory layout for Azure CI
vinhowe May 5, 2021
80641cc
Clean up whitespace in package_ue4_project.sh
vinhowe May 5, 2021
dfd0962
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 5, 2021
456ed45
Hopefully get build working on CI
vinhowe May 5, 2021
aacaba9
Update azure-pipelines.yml for Azure Pipelines
vinhowe May 5, 2021
89f085f
Push packaged CI builds to /mnt/artifacts
vinhowe May 5, 2021
6f3e4be
Merge branch 'azure-pipelines' of github.com:BYU-PCCL/holodeck-engine…
vinhowe May 5, 2021
f0f05aa
Another attempt to get CI building
vinhowe May 5, 2021
3278962
Use ue4-accessible artifacts dir
vinhowe May 5, 2021
112577d
Don't create artifacts dir because it's created for us
vinhowe May 5, 2021
5f6fd46
Actually do add artifact subdirectory
vinhowe May 5, 2021
23acc67
Copy config from where I think holodeck-configs is actually
vinhowe May 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions Build/ContinuousIntegration/package_ue4_project.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,16 @@ mkdir Content-Backup
cp -r Content/* Content-Backup
ls Content-Backup

# Create output dir
mkdir -p /home/ue4/artifacts/$1

# Package each
for packagepath in holodeck-worlds/*/; do
for packagepath in ../holodeck-worlds/*/; do
packagename=$(basename $packagepath)

echo "⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠"
echo "⚠ Packaging $packagename..."
echo "⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠⚠"


# Copy everything in the worlds /Content directory into the UE4 projects
# Delete the previous Content folder. This is so that we can mv the worlds quickly, and
Expand All @@ -29,15 +31,15 @@ for packagepath in holodeck-worlds/*/; do
mkdir Content

echo "👉 Copying Holodeck content folder from $packagepath..."
mv holodeck-worlds/$packagename/Content/* Content/
mv ../holodeck-worlds/$packagename/Content/* Content/

echo "👉 Applying Holodeck changes..."
cp -r Content-Backup/* Content

# Package it up
echo "👉 Starting Packaging Process..."
ue4 package Development

# Make sure it worked
code=$?
if [ code -ne 0 ]; then
Expand All @@ -55,13 +57,14 @@ for packagepath in holodeck-worlds/*/; do

# Copy configuration files into the output directory
echo "👉 Copying config files into output directory..."
cp ../holodeck-configs/$packagename/*.json .
cp ../../holodeck-configs/$packagename/*.json .

echo "👉 Compressing contents into $packagename.zip..."
zip -r "$packagename.zip" *

echo "👉 Moving $packagename.zip out of dist/ folder..."
mv "$packagename.zip" ..
echo "👉 Moving $packagename.zip to artifacts directory..."
# $1 is Azure build ID
mv "$packagename.zip" /home/ue4/artifacts/$1

echo "👉 Deleting config files for $packagename..."
rm *.json
Expand All @@ -71,4 +74,4 @@ for packagepath in holodeck-worlds/*/; do
echo "👉 Done packaging package $packagename"
done

echo "👉 Sucessfully packaged all the packages 🎉🎉"
echo "👉 Sucessfully packaged all the packages 🎉🎉"
4 changes: 2 additions & 2 deletions Content/DefaultPlayerController.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/ExampleLevel.umap
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/ExampleLevel_BuiltData.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/HolodeckContent/Agents/AgentFollower.uasset
Git LFS file not shown
4 changes: 2 additions & 2 deletions Content/HolodeckContent/Agents/AgentSpectatorPawn.uasset
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Git LFS file not shown
Loading