actions
/
unity-builder
mirror of https://github.com/game-ci/unity-builder.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix

pull/289/head
Frostebite 2021-08-15 23:40:16 +00:00 committed by GitHub
parent d1ecc89a3e
commit 255dc97e82
4 changed files with 23 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
dist/index.js vendored
View File

@ -2300,7 +2300,7 @@ class RemoteBuilder {
echo ' ' echo ' '
echo 'Initializing source repository for cloning with caching of LFS files' echo 'Initializing source repository for cloning with caching of LFS files'
${initializeSourceRepoForCaching} ${initializeSourceRepoForCaching}
export LFS_ASSETS_HASH="$(cat ${this.repoPathFull}/.lfs-assets-id)" export LFS_ASSETS_HASH="$(cat ${this.repoPathFull}/.lfs-assets-guid)"
echo 'Source repository initialized' echo 'Source repository initialized'
echo ' ' echo ' '
${process.env.DEBUG ? '' : '#'}echo $LFS_ASSETS_HASH ${process.env.DEBUG ? '' : '#'}echo $LFS_ASSETS_HASH
@ -2348,13 +2348,13 @@ class RemoteBuilder {
printenv printenv
apk update -q apk update -q
apk add zip -q apk add zip -q
cd "${this.libraryFolderFull}" cd "$libraryFolderFull"
zip -r "lib-${this.buildGuid}.zip" "${this.libraryFolderFull}" zip -r "lib-$buildGuid.zip" "$libraryFolderFull"
mv "lib-${this.buildGuid}.zip" "${this.cacheFolderFull}/lib" mv "lib-$buildGuid.zip" "$cacheFolderFull/lib"
cd "${this.projectPathFull}" cd "$projectPathFull"
ls -lh "${this.projectPathFull}" ls -lh "$projectPathFull"
zip -r "build-${this.buildGuid}.zip" "${this.projectPathFull}/${RemoteBuilder.buildParams.buildPath}" zip -r "build-$buildGuid.zip" "$projectPathFull/${RemoteBuilder.buildParams.buildPath}"
mv "build-${this.buildGuid}.zip" "/${buildVolumeFolder}/${this.buildGuid}/build-${this.buildGuid}.zip" mv "build-$buildGuid.zip" "/${buildVolumeFolder}/$buildGuid/build-$buildGuid.zip"
`, `,
], `/${buildVolumeFolder}`, `/${buildVolumeFolder}`, [ ], `/${buildVolumeFolder}`, `/${buildVolumeFolder}`, [
{ {
@ -2445,56 +2445,6 @@ class RemoteBuilder {
}; };
})); }));
} }
static readUploadArtifactsSecrets() {
return [
{
ParameterKey: 'AWSAccessKeyID',
EnvironmentVariable: 'AWS_ACCESS_KEY_ID',
ParameterValue: process.env.AWS_ACCESS_KEY_ID || '',
},
{
ParameterKey: 'AWSSecretAccessKey',
EnvironmentVariable: 'AWS_SECRET_ACCESS_KEY',
ParameterValue: process.env.AWS_SECRET_ACCESS_KEY || '',
},
...this.defaultSecrets,
];
}
static readDeployToSteamSecrets() {
return [
{
EnvironmentVariable: 'INPUT_APPID',
ParameterKey: 'appId',
ParameterValue: process.env.APP_ID || '',
},
{
EnvironmentVariable: 'INPUT_BUILDDESCRIPTION',
ParameterKey: 'buildDescription',
ParameterValue: process.env.BUILD_DESCRIPTION || '',
},
{
EnvironmentVariable: 'INPUT_ROOTPATH',
ParameterKey: 'rootPath',
ParameterValue: RemoteBuilder.buildParams.buildPath,
},
{
EnvironmentVariable: 'INPUT_RELEASEBRANCH',
ParameterKey: 'releaseBranch',
ParameterValue: process.env.RELEASE_BRANCH || '',
},
{
EnvironmentVariable: 'INPUT_LOCALCONTENTSERVER',
ParameterKey: 'localContentServer',
ParameterValue: process.env.LOCAL_CONTENT_SERVER || '',
},
{
EnvironmentVariable: 'INPUT_PREVIEWENABLED',
ParameterKey: 'previewEnabled',
ParameterValue: process.env.PREVIEW_ENABLED || '',
},
...this.defaultSecrets,
];
}
static readBuildEnvironmentVariables() { static readBuildEnvironmentVariables() {
return [ return [
{ {

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

12
dist/remote-builder/cloneNoLFS.sh vendored
View File

@ -18,15 +18,15 @@ git clone $cloneUrl $repoPathFull
git checkout $githubSha git checkout $githubSha
echo "Checked out $githubSha" echo "Checked out $githubSha"
git lfs ls-files -l | cut -d ' ' -f1 | sort > .lfs-assets-id git lfs ls-files -l | cut -d ' ' -f1 | sort > .lfs-assets-guid
md5sum .lfs-assets-id > .lfs-assets-id-sum md5sum .lfs-assets-guid > .lfs-assets-guid-sum
echo ' ' echo ' '
echo 'Contents of .lfs-assets-id file:' echo 'Contents of .lfs-assets-guid file:'
cat .lfs-assets-id cat .lfs-assets-guid
echo ' ' echo ' '
echo 'Contents of .lfs-assets-id-sum file:' echo 'Contents of .lfs-assets-guid-sum file:'
cat .lfs-assets-id-sum cat .lfs-assets-guid-sum
echo ' ' echo ' '

68
src/model/remote-builder/remote-builder.ts
View File

@ -135,7 +135,7 @@ class RemoteBuilder {
echo ' ' echo ' '
echo 'Initializing source repository for cloning with caching of LFS files' echo 'Initializing source repository for cloning with caching of LFS files'
${initializeSourceRepoForCaching} ${initializeSourceRepoForCaching}
export LFS_ASSETS_HASH="$(cat ${this.repoPathFull}/.lfs-assets-id)" export LFS_ASSETS_HASH="$(cat ${this.repoPathFull}/.lfs-assets-guid)"
echo 'Source repository initialized' echo 'Source repository initialized'
echo ' ' echo ' '
${process.env.DEBUG ? '' : '#'}echo $LFS_ASSETS_HASH ${process.env.DEBUG ? '' : '#'}echo $LFS_ASSETS_HASH
@ -197,13 +197,13 @@ class RemoteBuilder {
printenv printenv
apk update -q apk update -q
apk add zip -q apk add zip -q
cd "${this.libraryFolderFull}" cd "$libraryFolderFull"
zip -r "lib-${this.buildGuid}.zip" "${this.libraryFolderFull}" zip -r "lib-$buildGuid.zip" "$libraryFolderFull"
mv "lib-${this.buildGuid}.zip" "${this.cacheFolderFull}/lib" mv "lib-$buildGuid.zip" "$cacheFolderFull/lib"
cd "${this.projectPathFull}" cd "$projectPathFull"
ls -lh "${this.projectPathFull}" ls -lh "$projectPathFull"
zip -r "build-${this.buildGuid}.zip" "${this.projectPathFull}/${RemoteBuilder.buildParams.buildPath}" zip -r "build-$buildGuid.zip" "$projectPathFull/${RemoteBuilder.buildParams.buildPath}"
mv "build-${this.buildGuid}.zip" "/${buildVolumeFolder}/${this.buildGuid}/build-${this.buildGuid}.zip" mv "build-$buildGuid.zip" "/${buildVolumeFolder}/$buildGuid/build-$buildGuid.zip"
`, `,
], ],
`/${buildVolumeFolder}`, `/${buildVolumeFolder}`,
@ -307,58 +307,6 @@ class RemoteBuilder {
); );
} }
private static readUploadArtifactsSecrets() {
return [
{
ParameterKey: 'AWSAccessKeyID',
EnvironmentVariable: 'AWS_ACCESS_KEY_ID',
ParameterValue: process.env.AWS_ACCESS_KEY_ID || '',
},
{
ParameterKey: 'AWSSecretAccessKey',
EnvironmentVariable: 'AWS_SECRET_ACCESS_KEY',
ParameterValue: process.env.AWS_SECRET_ACCESS_KEY || '',
},
...this.defaultSecrets,
];
}
private static readDeployToSteamSecrets(): RemoteBuilderSecret[] {
return [
{
EnvironmentVariable: 'INPUT_APPID',
ParameterKey: 'appId',
ParameterValue: process.env.APP_ID || '',
},
{
EnvironmentVariable: 'INPUT_BUILDDESCRIPTION',
ParameterKey: 'buildDescription',
ParameterValue: process.env.BUILD_DESCRIPTION || '',
},
{
EnvironmentVariable: 'INPUT_ROOTPATH',
ParameterKey: 'rootPath',
ParameterValue: RemoteBuilder.buildParams.buildPath,
},
{
EnvironmentVariable: 'INPUT_RELEASEBRANCH',
ParameterKey: 'releaseBranch',
ParameterValue: process.env.RELEASE_BRANCH || '',
},
{
EnvironmentVariable: 'INPUT_LOCALCONTENTSERVER',
ParameterKey: 'localContentServer',
ParameterValue: process.env.LOCAL_CONTENT_SERVER || '',
},
{
EnvironmentVariable: 'INPUT_PREVIEWENABLED',
ParameterKey: 'previewEnabled',
ParameterValue: process.env.PREVIEW_ENABLED || '',
},
...this.defaultSecrets,
];
}
private static readBuildEnvironmentVariables(): RemoteBuilderEnvironmentVariable[] { private static readBuildEnvironmentVariables(): RemoteBuilderEnvironmentVariable[] {
return [ return [
{ {