Remove debug directory listings and try setSecret to mask serial
parent
a65235e960
commit
6f7ae3b1c5
|
|
@ -336,6 +336,25 @@ exports.default = Cache;
|
||||||
|
|
||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
||||||
|
if (k2 === undefined) k2 = k;
|
||||||
|
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
|
||||||
|
}) : (function(o, m, k, k2) {
|
||||||
|
if (k2 === undefined) k2 = k;
|
||||||
|
o[k2] = m[k];
|
||||||
|
}));
|
||||||
|
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
||||||
|
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
||||||
|
}) : function(o, v) {
|
||||||
|
o["default"] = v;
|
||||||
|
});
|
||||||
|
var __importStar = (this && this.__importStar) || function (mod) {
|
||||||
|
if (mod && mod.__esModule) return mod;
|
||||||
|
var result = {};
|
||||||
|
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
||||||
|
__setModuleDefault(result, mod);
|
||||||
|
return result;
|
||||||
|
};
|
||||||
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
||||||
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
||||||
return new (P || (P = Promise))(function (resolve, reject) {
|
return new (P || (P = Promise))(function (resolve, reject) {
|
||||||
|
|
@ -349,6 +368,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
||||||
return (mod && mod.__esModule) ? mod : { "default": mod };
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
||||||
};
|
};
|
||||||
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
Object.defineProperty(exports, "__esModule", ({ value: true }));
|
||||||
|
const core = __importStar(__webpack_require__(42186));
|
||||||
const exec_1 = __webpack_require__(71514);
|
const exec_1 = __webpack_require__(71514);
|
||||||
const image_tag_1 = __importDefault(__webpack_require__(57648));
|
const image_tag_1 = __importDefault(__webpack_require__(57648));
|
||||||
const fs = __webpack_require__(35747);
|
const fs = __webpack_require__(35747);
|
||||||
|
|
@ -426,6 +446,7 @@ 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) {
|
||||||
|
|
@ -434,8 +455,12 @@ 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.`);
|
||||||
}
|
}
|
||||||
process.env.UNITY_SERIAL = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE);
|
unitySerial = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE);
|
||||||
}
|
}
|
||||||
|
else {
|
||||||
|
unitySerial = process.env.UNITY_SERIAL;
|
||||||
|
}
|
||||||
|
core.setSecret(unitySerial);
|
||||||
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
|
||||||
authenticate the license. Make sure to set them inside UNITY_EMAIL
|
authenticate the license. Make sure to set them inside UNITY_EMAIL
|
||||||
|
|
@ -450,7 +475,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 \
|
--env UNITY_SERIAL="${unitySerial}" \
|
||||||
--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}" \
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1,13 +1,3 @@
|
||||||
Get-ChildItem -Path "c:/regkeys"
|
|
||||||
|
|
||||||
Get-ChildItem -Path "c:/Program Files (x86)/Microsoft Visual Studio"
|
|
||||||
|
|
||||||
Get-ChildItem -Path "c:/Program Files (x86)/Windows Kits"
|
|
||||||
|
|
||||||
Get-ChildItem -Path "c:/ProgramData/Microsoft/VisualStudio"
|
|
||||||
|
|
||||||
Get-ChildItem -Path "c:/"
|
|
||||||
|
|
||||||
# Activate Unity
|
# Activate Unity
|
||||||
& "c:\steps\activate.ps1"
|
& "c:\steps\activate.ps1"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,3 +1,4 @@
|
||||||
|
import * as core from '@actions/core';
|
||||||
import { exec } from '@actions/exec';
|
import { exec } from '@actions/exec';
|
||||||
import ImageTag from './image-tag';
|
import ImageTag from './image-tag';
|
||||||
const fs = require('fs');
|
const fs = require('fs');
|
||||||
|
|
@ -102,6 +103,7 @@ 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) {
|
||||||
|
|
@ -110,8 +112,11 @@ 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.`);
|
||||||
}
|
}
|
||||||
process.env.UNITY_SERIAL = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE);
|
unitySerial = this.getSerialFromLicenseFile(process.env.UNITY_LICENSE);
|
||||||
|
} else {
|
||||||
|
unitySerial = process.env.UNITY_SERIAL!;
|
||||||
}
|
}
|
||||||
|
core.setSecret(unitySerial);
|
||||||
|
|
||||||
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
|
||||||
|
|
@ -130,7 +135,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 \
|
--env UNITY_SERIAL="${unitySerial}" \
|
||||||
--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}" \
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue