cleanup
parent
c6a6a4a919
commit
e730ffde2c
|
|
@ -241,14 +241,12 @@ class AWS {
|
||||||
apk add unzip;
|
apk add unzip;
|
||||||
apk add git-lfs;
|
apk add git-lfs;
|
||||||
apk add jq;
|
apk add jq;
|
||||||
|
|
||||||
# Get source repo for project to be built and game-ci repo for utilties
|
# Get source repo for project to be built and game-ci repo for utilties
|
||||||
git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/${repositoryDirectoryName} -q
|
git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/${repositoryDirectoryName} -q
|
||||||
git clone https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder -q
|
git clone https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder -q
|
||||||
cd /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/
|
cd /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/
|
||||||
git checkout $GITHUB_SHA
|
git checkout $GITHUB_SHA
|
||||||
cd /${efsDirectoryName}/
|
cd /${efsDirectoryName}/
|
||||||
|
|
||||||
# Look for usable cache
|
# Look for usable cache
|
||||||
if [ ! -d ${cacheDirectoryName} ]; then
|
if [ ! -d ${cacheDirectoryName} ]; then
|
||||||
mkdir ${cacheDirectoryName}
|
mkdir ${cacheDirectoryName}
|
||||||
|
|
@ -262,17 +260,13 @@ class AWS {
|
||||||
echo 'Cached Libraries for ${branchName} from previous builds:'
|
echo 'Cached Libraries for ${branchName} from previous builds:'
|
||||||
ls
|
ls
|
||||||
echo ' '
|
echo ' '
|
||||||
|
|
||||||
libDir="/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library"
|
libDir="/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library"
|
||||||
|
if library directory doesn't exist create it,
|
||||||
# if library directory doesn't exist create it,
|
if [ -d $libDir ]; then
|
||||||
# if [ -d $libDir ]; then
|
echo "Library folder already present, make sure you setup .gitignore correctly (cleaning out Library folder for this build)!"
|
||||||
# echo "Library folder already present, make sure you setup .gitignore correctly (cleaning out Library folder for this build)!"
|
rm -r $libDir
|
||||||
# rm -r $libDir
|
fi
|
||||||
# fi
|
|
||||||
|
|
||||||
echo "Checking cache"
|
echo "Checking cache"
|
||||||
|
|
||||||
# Restore cache
|
# Restore cache
|
||||||
latest=$(ls -t | head -1)
|
latest=$(ls -t | head -1)
|
||||||
if [ ! -z "$latest" ]; then
|
if [ ! -z "$latest" ]; then
|
||||||
|
|
@ -283,8 +277,6 @@ class AWS {
|
||||||
else
|
else
|
||||||
echo "Cache does not exist"
|
echo "Cache does not exist"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Print out important directories
|
# Print out important directories
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Repo:'
|
echo 'Repo:'
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -29,14 +29,12 @@ class AWS {
|
||||||
apk add unzip;
|
apk add unzip;
|
||||||
apk add git-lfs;
|
apk add git-lfs;
|
||||||
apk add jq;
|
apk add jq;
|
||||||
|
|
||||||
# Get source repo for project to be built and game-ci repo for utilties
|
# Get source repo for project to be built and game-ci repo for utilties
|
||||||
git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/${repositoryDirectoryName} -q
|
git clone https://${process.env.GITHUB_TOKEN}@github.com/${process.env.GITHUB_REPOSITORY}.git ${buildUid}/${repositoryDirectoryName} -q
|
||||||
git clone https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder -q
|
git clone https://${process.env.GITHUB_TOKEN}@github.com/game-ci/unity-builder.git ${buildUid}/builder -q
|
||||||
cd /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/
|
cd /${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/
|
||||||
git checkout $GITHUB_SHA
|
git checkout $GITHUB_SHA
|
||||||
cd /${efsDirectoryName}/
|
cd /${efsDirectoryName}/
|
||||||
|
|
||||||
# Look for usable cache
|
# Look for usable cache
|
||||||
if [ ! -d ${cacheDirectoryName} ]; then
|
if [ ! -d ${cacheDirectoryName} ]; then
|
||||||
mkdir ${cacheDirectoryName}
|
mkdir ${cacheDirectoryName}
|
||||||
|
|
@ -50,17 +48,13 @@ class AWS {
|
||||||
echo 'Cached Libraries for ${branchName} from previous builds:'
|
echo 'Cached Libraries for ${branchName} from previous builds:'
|
||||||
ls
|
ls
|
||||||
echo ' '
|
echo ' '
|
||||||
|
|
||||||
libDir="/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library"
|
libDir="/${efsDirectoryName}/${buildUid}/${repositoryDirectoryName}/${buildParameters.projectPath}/Library"
|
||||||
|
if library directory doesn't exist create it,
|
||||||
# if library directory doesn't exist create it,
|
if [ -d $libDir ]; then
|
||||||
# if [ -d $libDir ]; then
|
echo "Library folder already present, make sure you setup .gitignore correctly (cleaning out Library folder for this build)!"
|
||||||
# echo "Library folder already present, make sure you setup .gitignore correctly (cleaning out Library folder for this build)!"
|
rm -r $libDir
|
||||||
# rm -r $libDir
|
fi
|
||||||
# fi
|
|
||||||
|
|
||||||
echo "Checking cache"
|
echo "Checking cache"
|
||||||
|
|
||||||
# Restore cache
|
# Restore cache
|
||||||
latest=$(ls -t | head -1)
|
latest=$(ls -t | head -1)
|
||||||
if [ ! -z "$latest" ]; then
|
if [ ! -z "$latest" ]; then
|
||||||
|
|
@ -71,8 +65,6 @@ class AWS {
|
||||||
else
|
else
|
||||||
echo "Cache does not exist"
|
echo "Cache does not exist"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Print out important directories
|
# Print out important directories
|
||||||
echo ' '
|
echo ' '
|
||||||
echo 'Repo:'
|
echo 'Repo:'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue