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

Prevent Unity serial from leaking to console

pull/305/head
Andrew Kahr 2022-01-24 02:00:03 -08:00
parent 2baaed1013
commit 03403efd8e
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dist/index.js vendored
View File

@ -426,7 +426,6 @@ class Docker {
break; break;
} }
case 'win32': { case 'win32': {
let unitySerial = '';
if (!process.env.UNITY_SERIAL) { if (!process.env.UNITY_SERIAL) {
//No serial was present so it is a personal license that we need to convert //No serial was present so it is a personal license that we need to convert
if (!process.env.UNITY_LICENSE) { if (!process.env.UNITY_LICENSE) {
@ -435,10 +434,7 @@ class Docker {
steps and set the UNITY_LICENSE GitHub secret or enter a Unity steps and set the UNITY_LICENSE GitHub secret or enter a Unity
serial number inside the UNITY_SERIAL GitHub secret.`); serial number inside the UNITY_SERIAL GitHub secret.`);
} }
unitySerial = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE); process.env.UNITY_SERIAL = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE);
}
else {
unitySerial = process.env.UNITY_SERIAL;
} }
if (!(process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD)) { if (!(process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD)) {
throw new Error(`Unity email and password must be set for Windows based builds to throw new Error(`Unity email and password must be set for Windows based builds to
@ -454,7 +450,7 @@ class Docker {
--env UNITY_LICENSE_FILE \ --env UNITY_LICENSE_FILE \
--env UNITY_EMAIL \ --env UNITY_EMAIL \
--env UNITY_PASSWORD \ --env UNITY_PASSWORD \
--env UNITY_SERIAL="${unitySerial}" \ --env UNITY_SERIAL \
--env UNITY_VERSION="${version}" \ --env UNITY_VERSION="${version}" \
--env USYM_UPLOAD_AUTH_TOKEN \ --env USYM_UPLOAD_AUTH_TOKEN \
--env PROJECT_PATH="${projectPath}" \ --env PROJECT_PATH="${projectPath}" \

2
dist/index.js.map vendored
View File

File diff suppressed because one or more lines are too long

7
src/model/docker.ts
View File

@ -102,7 +102,6 @@ class Docker {
break; break;
} }
case 'win32': { case 'win32': {
let unitySerial = '';
if (!process.env.UNITY_SERIAL) { if (!process.env.UNITY_SERIAL) {
//No serial was present so it is a personal license that we need to convert //No serial was present so it is a personal license that we need to convert
if (!process.env.UNITY_LICENSE) { if (!process.env.UNITY_LICENSE) {
@ -111,9 +110,7 @@ class Docker {
steps and set the UNITY_LICENSE GitHub secret or enter a Unity steps and set the UNITY_LICENSE GitHub secret or enter a Unity
serial number inside the UNITY_SERIAL GitHub secret.`); serial number inside the UNITY_SERIAL GitHub secret.`);
} }
unitySerial = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE); process.env.UNITY_SERIAL = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE);
} else {
unitySerial = process.env.UNITY_SERIAL!;
} }
if (!(process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD)) { if (!(process.env.UNITY_EMAIL && process.env.UNITY_PASSWORD)) {
@ -133,7 +130,7 @@ class Docker {
--env UNITY_LICENSE_FILE \ --env UNITY_LICENSE_FILE \
--env UNITY_EMAIL \ --env UNITY_EMAIL \
--env UNITY_PASSWORD \ --env UNITY_PASSWORD \
--env UNITY_SERIAL="${unitySerial}" \ --env UNITY_SERIAL \
--env UNITY_VERSION="${version}" \ --env UNITY_VERSION="${version}" \
--env USYM_UPLOAD_AUTH_TOKEN \ --env USYM_UPLOAD_AUTH_TOKEN \
--env PROJECT_PATH="${projectPath}" \ --env PROJECT_PATH="${projectPath}" \