Skip to content

unity-setup@v1.0.1 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Aug 6, 2024
Merged

unity-setup@v1.0.1 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
d32306b
unity-setup@v1.0.1
StephenHodgson Aug 6, 2024
8205d5c
.
StephenHodgson Aug 6, 2024
1a7a5b9
.
StephenHodgson Aug 6, 2024
908718e
.
StephenHodgson Aug 6, 2024
396e38a
.
StephenHodgson Aug 6, 2024
ff63739
.
StephenHodgson Aug 6, 2024
4ad0649
.
StephenHodgson Aug 6, 2024
71e4b10
.
StephenHodgson Aug 6, 2024
f73b38d
.
StephenHodgson Aug 6, 2024
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
151 changes: 69 additions & 82 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31143,8 +31143,8 @@ exports["default"] = _default;
/***/ 7229:
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

const { FindGlobPattern } = __nccwpck_require__(4345);
const core = __nccwpck_require__(2186);
const glob = __nccwpck_require__(8090);
const fs = (__nccwpck_require__(7147).promises);
const semver = __nccwpck_require__(1383);
const path = __nccwpck_require__(1017);
Expand Down Expand Up @@ -31287,17 +31287,16 @@ function getDefaultModules() {
async function getVersionFilePath() {
let projectVersionPath = core.getInput('version-file');
if (!projectVersionPath) {
projectVersionPath = await searchForVersionFile();
projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**/ProjectVersion.txt'));
} else {
projectVersionPath = path.join(process.cwd(), projectVersionPath);
core.debug(`resolve absolute: ${projectVersionPath}`);
core.info(`projectVersionPath: ${projectVersionPath}`);
}
try {
await fs.access(projectVersionPath, fs.constants.R_OK);
return projectVersionPath;
} catch (error) {
try {
projectVersionPath = await searchForVersionFile();
projectVersionPath = await FindGlobPattern(projectVersionPath);
await fs.access(projectVersionPath, fs.constants.R_OK);
return projectVersionPath;
} catch (error) {
Expand All @@ -31307,14 +31306,6 @@ async function getVersionFilePath() {
}
}

async function searchForVersionFile() {
const globber = await glob.create('**/ProjectVersion.txt');
for await (const file of globber.globGenerator()) {
core.debug(`resolve glob: ${file}`);
return file;
}
}

function getUnityVersionsFromInput() {
const versions = [];
const inputVersions = core.getInput('unity-version');
Expand Down Expand Up @@ -31353,29 +31344,39 @@ module.exports = { ValidateInputs };
/***/ 133:
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

const { GetEditorRootPath, ReadFileContents } = __nccwpck_require__(4345);
const { GetEditorRootPath, ReadFileContents, FindGlobPattern } = __nccwpck_require__(4345);
const core = __nccwpck_require__(2186);
const exec = __nccwpck_require__(1514);
const glob = __nccwpck_require__(8090);
const fs = (__nccwpck_require__(7147).promises);
const path = __nccwpck_require__(1017);
const os = __nccwpck_require__(2037);

async function CheckAndroidSdkInstalled(editorPath, projectPath) {
core.startGroup('Validating Android Target SDK Installed...');
let sdkPath = undefined;
try {
await createRepositoryCfg();
const rootEditorPath = await GetEditorRootPath(editorPath);
const projectSettingsPath = path.join(projectPath, 'ProjectSettings/ProjectSettings.asset');
const projectSettingsContent = await ReadFileContents(projectSettingsPath);
const androidTargetSdk = projectSettingsContent.match(/(?<=AndroidTargetSdkVersion: )\d+/);
if (androidTargetSdk === undefined || androidTargetSdk === 0) { return; }
core.info(`Android Target SDK:\n > android-${androidTargetSdk}`);
await createRepositoryCfg();
const sdkManagerPath = await getSdkManager(editorPath);
const javaSdk = await getJDKPath(editorPath);
sdkPath = await getAndroidSdkPath(rootEditorPath, androidTargetSdk);
if (sdkPath) {
core.info(`Target Android SDK android-${androidTargetSdk} Installed in:\n > "${sdkPath}"`);
return;
}
core.info(`Installing Android Target SDK:\n > android-${androidTargetSdk}`);
const sdkManagerPath = await getSdkManager(rootEditorPath);
const javaSdk = await getJDKPath(rootEditorPath);
await execSdkManager(sdkManagerPath, javaSdk, ['--licenses']);
await execSdkManager(sdkManagerPath, javaSdk, ['--update']);
await execSdkManager(sdkManagerPath, javaSdk, ['platform-tools', `platforms;android-${androidTargetSdk}`]);
await validateSdkPath(editorPath, androidTargetSdk);
sdkPath = await getAndroidSdkPath(rootEditorPath, androidTargetSdk);
if (!sdkPath) {
throw new Error(`Failed to install android-${androidTargetSdk} in ${rootEditorPath}`);
}
core.info(`Target Android SDK Installed in:\n > "${sdkPath}"`);
} finally {
core.endGroup();
}
Expand All @@ -31385,41 +31386,20 @@ async function createRepositoryCfg() {
const androidPath = path.join(os.homedir(), '.android');
await fs.mkdir(androidPath, { recursive: true });
const fileHandle = await fs.open(path.join(androidPath, 'repositories.cfg'), 'w');
try {
// Empty file
} finally {
await fileHandle.close();
}
await fileHandle.close();
}

async function getJDKPath(editorPath) {
core.debug(`editorPath: ${editorPath}`);
const rootEditorPath = await GetEditorRootPath(editorPath);
core.debug(`rootEditorPath: ${rootEditorPath}`);
let globPath = path.join(rootEditorPath, '**', 'AndroidPlayer', 'OpenJDK');
try {
core.debug(`globPath: ${globPath}`);
globPath = path.normalize(globPath);
core.debug(`normalized globPath: ${globPath}`);
const globber = await glob.create(globPath);
const globPaths = await globber.glob();
core.debug(`globPaths: ${globPaths}`);
const jdkPath = globPaths[0];
if (!jdkPath) {
throw new Error(`Failed to resolve OpenJDK in ${globPath}\n > ${globPaths}`);
}
await fs.access(jdkPath, fs.constants.R_OK);
core.info(`jdkPath:\n > "${jdkPath}"`);
return jdkPath;
} catch (error) {
throw error;
async function getJDKPath(rootEditorPath) {
const jdkPath = await FindGlobPattern(path.join(rootEditorPath, '**', 'AndroidPlayer', 'OpenJDK'));
if (!jdkPath) {
throw new Error(`Failed to resolve OpenJDK in ${globPath}\n > ${globPaths}`);
}
await fs.access(jdkPath, fs.constants.R_OK);
core.debug(`jdkPath:\n > "${jdkPath}"`);
return jdkPath;
}

async function getSdkManager(editorPath) {
core.debug(`editorPath: ${editorPath}`);
const rootEditorPath = await GetEditorRootPath(editorPath);
core.debug(`rootEditorPath: ${rootEditorPath}`);
async function getSdkManager(rootEditorPath) {
let globPath;
switch (process.platform) {
case 'darwin':
Expand All @@ -31432,38 +31412,26 @@ async function getSdkManager(editorPath) {
default:
throw new Error(`Unsupported platform: ${process.platform}`);
}
try {
core.debug(`globPath: ${globPath}`);
globPath = path.normalize(globPath);
core.debug(`normalized globPath: ${globPath}`);
const globber = await glob.create(globPath);
const globPaths = await globber.glob();
core.debug(`globPaths: ${globPaths}`);
const sdkmanagerPath = globPaths[0];
if (!sdkmanagerPath) {
throw new Error(`Failed to resolve sdkmanager in ${globPath}\n > ${globPaths}`);
}
await fs.access(sdkmanagerPath, fs.constants.R_OK);
core.info(`sdkmanagerPath:\n > "${sdkmanagerPath}"`);
return sdkmanagerPath;
} catch (error) {
throw error;
const sdkmanagerPath = await FindGlobPattern(globPath);
if (!sdkmanagerPath) {
throw new Error(`Failed to resolve sdkmanager in ${globPath}\n > ${globPaths}`);
}
await fs.access(sdkmanagerPath, fs.constants.R_OK);
core.debug(`sdkmanagerPath:\n > "${sdkmanagerPath}"`);
return sdkmanagerPath;
}

async function validateSdkPath(editorPath, androidTargetSdk) {
core.debug(`attempting to validate Android SDK Path...\n > editorPath: ${editorPath}\n > androidTargetSdk: ${androidTargetSdk}`);
const rootEditorPath = await GetEditorRootPath(editorPath);
core.debug(`rootEditorPath: ${rootEditorPath}`);
const sdkPath = path.join(rootEditorPath, '**', 'AndroidPlayer', '**', `android-${androidTargetSdk}`);
core.debug(`sdkPath: ${sdkPath}`);
const globber = await glob.create(sdkPath);
const globPaths = await globber.glob();
core.debug(`globPaths: ${globPaths}`);
if (globPaths.length === 0) {
throw new Error(`Failed to install Android SDK: ${sdkPath}`);
async function getAndroidSdkPath(rootEditorPath, androidTargetSdk) {
core.debug(`Attempting to locate Android SDK Path...\n > editorPath: ${rootEditorPath}\n > androidTargetSdk: ${androidTargetSdk}`);
const sdkPath = await FindGlobPattern(path.join(rootEditorPath, '**', 'AndroidPlayer', '**', `android-${androidTargetSdk}`));
try {
await fs.access(sdkPath, fs.constants.R_OK);
} catch (error) {
core.debug(`android-${androidTargetSdk} not installed`);
return undefined;
}
core.info(`Target Android SDK Installed in:\n > "${globPaths[0]}"`);
core.debug(`sdkPath:\n > "${sdkPath}"`);
return sdkPath;
}

async function execSdkManager(sdkManagerPath, javaSdk, args) {
Expand Down Expand Up @@ -31588,6 +31556,9 @@ async function installUnityHub() {
listeners: {
stdout: (data) => {
output += data.toString();
},
stderr: (data) => {
output += data.toString();
}
}
});
Expand Down Expand Up @@ -31619,6 +31590,9 @@ async function execUnityHub(args) {
listeners: {
stdout: (data) => {
output += data.toString();
},
stderr: (data) => {
output += data.toString();
}
},
ignoreReturnCode: true
Expand All @@ -31639,6 +31613,9 @@ async function execUnityHub(args) {
},
stdout: (data) => {
output += data.toString();
},
stderr: (data) => {
output += data.toString();
}
},
ignoreReturnCode: true,
Expand Down Expand Up @@ -31820,6 +31797,7 @@ module.exports = { Get, Unity, ListInstalledEditors }
/***/ ((module, __unused_webpack_exports, __nccwpck_require__) => {

const core = __nccwpck_require__(2186);
const glob = __nccwpck_require__(8090);
const fs = (__nccwpck_require__(7147).promises);
const path = __nccwpck_require__(1017);

Expand All @@ -31843,16 +31821,25 @@ async function GetEditorRootPath(editorPath) {
}

async function ReadFileContents(filePath) {
const fd = await fs.open(filePath, 'r');
const fileHandle = await fs.open(filePath, 'r');
try {
const projectSettingsContent = await fd.readFile('utf8');
const projectSettingsContent = await fileHandle.readFile('utf8');
return projectSettingsContent;
} finally {
await fd.close();
await fileHandle.close();
}
}

async function FindGlobPattern(pattern) {
core.debug(`searching for: ${pattern}...`);
const globber = await glob.create(pattern);
for await (const file of globber.globGenerator()) {
core.debug(`found glob: ${file}`);
return file;
}
}

module.exports = { GetEditorRootPath, ReadFileContents };
module.exports = { GetEditorRootPath, ReadFileContents, FindGlobPattern };


/***/ }),
Expand Down
2 changes: 1 addition & 1 deletion dist/index.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "unity-setup",
"version": "1.0.0",
"version": "1.0.1",
"description": "A GitHub action for setting up the Unity Game Engine for CI/CD workflows.",
"author": "Buildalon",
"license": "MIT",
Expand Down
17 changes: 4 additions & 13 deletions src/inputs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const { FindGlobPattern } = require('./utility');
const core = require('@actions/core');
const glob = require('@actions/glob');
const fs = require('fs').promises;
const semver = require('semver');
const path = require('path');
Expand Down Expand Up @@ -142,17 +142,16 @@ function getDefaultModules() {
async function getVersionFilePath() {
let projectVersionPath = core.getInput('version-file');
if (!projectVersionPath) {
projectVersionPath = await searchForVersionFile();
projectVersionPath = await FindGlobPattern(path.join(process.env.GITHUB_WORKSPACE, '**/ProjectVersion.txt'));
} else {
projectVersionPath = path.join(process.cwd(), projectVersionPath);
core.debug(`resolve absolute: ${projectVersionPath}`);
core.info(`projectVersionPath: ${projectVersionPath}`);
}
try {
await fs.access(projectVersionPath, fs.constants.R_OK);
return projectVersionPath;
} catch (error) {
try {
projectVersionPath = await searchForVersionFile();
projectVersionPath = await FindGlobPattern(projectVersionPath);
await fs.access(projectVersionPath, fs.constants.R_OK);
return projectVersionPath;
} catch (error) {
Expand All @@ -162,14 +161,6 @@ async function getVersionFilePath() {
}
}

async function searchForVersionFile() {
const globber = await glob.create('**/ProjectVersion.txt');
for await (const file of globber.globGenerator()) {
core.debug(`resolve glob: ${file}`);
return file;
}
}

function getUnityVersionsFromInput() {
const versions = [];
const inputVersions = core.getInput('unity-version');
Expand Down
Loading