Compare commits

..

1 Commits

Author SHA1 Message Date
dependabot[bot] c6be560bd9 Bump braces from 3.0.2 to 3.0.3
Bumps [braces](https://github.com/micromatch/braces) from 3.0.2 to 3.0.3.
- [Changelog](https://github.com/micromatch/braces/blob/master/CHANGELOG.md)
- [Commits](https://github.com/micromatch/braces/compare/3.0.2...3.0.3)

---
updated-dependencies:
- dependency-name: braces
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-06-16 10:20:33 +00:00
11 changed files with 293 additions and 379 deletions
@@ -74,7 +74,7 @@ namespace UnityBuilderAction
} }
catch (Exception e) catch (Exception e)
{ {
Debug.LogError("Failed to run default addressables build:\n" + e); Debug.LogError($"Failed to run default addressables build:\n{e}");
} }
} }
@@ -56,17 +56,17 @@ namespace UnityBuilderAction.Input
case "androidStudioProject": case "androidStudioProject":
EditorUserBuildSettings.exportAsGoogleAndroidProject = true; EditorUserBuildSettings.exportAsGoogleAndroidProject = true;
if (buildAppBundle != null) if (buildAppBundle != null)
buildAppBundle.SetValue(null, false, null); buildAppBundle.SetValue(null, false);
break; break;
case "androidAppBundle": case "androidAppBundle":
EditorUserBuildSettings.exportAsGoogleAndroidProject = false; EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
if (buildAppBundle != null) if (buildAppBundle != null)
buildAppBundle.SetValue(null, true, null); buildAppBundle.SetValue(null, true);
break; break;
case "androidPackage": case "androidPackage":
EditorUserBuildSettings.exportAsGoogleAndroidProject = false; EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
if (buildAppBundle != null) if (buildAppBundle != null)
buildAppBundle.SetValue(null, false, null); buildAppBundle.SetValue(null, false);
break; break;
} }
} }
@@ -28,7 +28,7 @@ namespace UnityBuilderAction.Input
} }
if (!Enum.IsDefined(typeof(BuildTarget), buildTarget)) { if (!Enum.IsDefined(typeof(BuildTarget), buildTarget)) {
Console.WriteLine(buildTarget + " is not a defined " + typeof(BuildTarget).Name); Console.WriteLine($"{buildTarget} is not a defined {nameof(BuildTarget)}");
EditorApplication.Exit(121); EditorApplication.Exit(121);
} }
@@ -41,10 +41,10 @@ namespace UnityBuilderAction.Input
const string defaultCustomBuildName = "TestBuild"; const string defaultCustomBuildName = "TestBuild";
string customBuildName; string customBuildName;
if (!validatedOptions.TryGetValue("customBuildName", out customBuildName)) { if (!validatedOptions.TryGetValue("customBuildName", out customBuildName)) {
Console.WriteLine("Missing argument -customBuildName, defaulting to" + defaultCustomBuildName); Console.WriteLine($"Missing argument -customBuildName, defaulting to {defaultCustomBuildName}.");
validatedOptions.Add("customBuildName", defaultCustomBuildName); validatedOptions.Add("customBuildName", defaultCustomBuildName);
} else if (customBuildName == "") { } else if (customBuildName == "") {
Console.WriteLine("Invalid argument -customBuildName, defaulting to" + defaultCustomBuildName); Console.WriteLine($"Invalid argument -customBuildName, defaulting to {defaultCustomBuildName}.");
validatedOptions.Add("customBuildName", defaultCustomBuildName); validatedOptions.Add("customBuildName", defaultCustomBuildName);
} }
@@ -57,11 +57,11 @@ namespace UnityBuilderAction.Input
string[] args = Environment.GetCommandLineArgs(); string[] args = Environment.GetCommandLineArgs();
Console.WriteLine( Console.WriteLine(
EOL + $"{EOL}" +
"###########################" + EOL + $"###########################{EOL}" +
"# Parsing settings #" + EOL + $"# Parsing settings #{EOL}" +
"###########################" + EOL + $"###########################{EOL}" +
EOL $"{EOL}"
); );
// Extract flags with optional values // Extract flags with optional values
@@ -78,7 +78,7 @@ namespace UnityBuilderAction.Input
string displayValue = secret ? "*HIDDEN*" : "\"" + value + "\""; string displayValue = secret ? "*HIDDEN*" : "\"" + value + "\"";
// Assign // Assign
Console.WriteLine("Found flag \"" + flag + "\" with value " + displayValue); Console.WriteLine($"Found flag \"{flag}\" with value {displayValue}.");
providedArguments.Add(flag, value); providedArguments.Add(flag, value);
} }
} }
@@ -30,7 +30,7 @@ namespace UnityBuilderAction.Reporting
prefix = "error"; prefix = "error";
break; break;
} }
Console.WriteLine(Environment.NewLine + "::" + prefix + "::" + condition + Environment.NewLine + stackTrace); Console.WriteLine($"{Environment.NewLine}::{prefix} ::{condition}{Environment.NewLine}{stackTrace}");
} }
} }
} }
@@ -11,16 +11,16 @@ namespace UnityBuilderAction.Reporting
public static void ReportSummary(BuildSummary summary) public static void ReportSummary(BuildSummary summary)
{ {
Console.WriteLine( Console.WriteLine(
EOL + $"{EOL}" +
"###########################" + EOL + $"###########################{EOL}" +
"# Build results #" + EOL + $"# Build results #{EOL}" +
"###########################" + EOL + $"###########################{EOL}" +
EOL + $"{EOL}" +
"Duration: " + summary.totalTime.ToString() + EOL + $"Duration: {summary.totalTime.ToString()}{EOL}" +
"Warnings: " + summary.totalWarnings.ToString() + EOL + $"Warnings: {summary.totalWarnings.ToString()}{EOL}" +
"Errors: " + summary.totalErrors.ToString() + EOL + $"Errors: {summary.totalErrors.ToString()}{EOL}" +
"Size: " + summary.totalSize.ToString() + " bytes" + EOL + $"Size: {summary.totalSize.ToString()} bytes{EOL}" +
EOL $"{EOL}"
); );
} }
@@ -21,11 +21,11 @@ namespace UnityBuilderAction.Versioning
version = GetSemanticCommitVersion(); version = GetSemanticCommitVersion();
Console.WriteLine("Repository has a valid version tag."); Console.WriteLine("Repository has a valid version tag.");
} else { } else {
version = "0.0." + GetTotalNumberOfCommits(); version = $"0.0.{GetTotalNumberOfCommits()}";
Console.WriteLine("Repository does not have tags to base the version on."); Console.WriteLine("Repository does not have tags to base the version on.");
} }
Console.WriteLine("Version is " + version); Console.WriteLine($"Version is {version}");
return version; return version;
} }
Generated Vendored
+1 -11
View File
@@ -8010,17 +8010,7 @@ class Versioning {
* identifies the current commit. * identifies the current commit.
*/ */
static async getVersionDescription() { static async getVersionDescription() {
const versionTags = (await this.git(['tag', '--list', '--merged', 'HEAD', '--sort=-creatordate'])) return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
.split('\n')
.filter(tag => new RegExp(this.grepCompatibleInputVersionRegex).test(tag));
if (versionTags.length === 0) {
core.warning('No valid version tags found. Using fallback description.');
return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
}
const latestVersionTag = versionTags[0];
const commitsCount = (await this.git(['rev-list', `${latestVersionTag}..HEAD`, '--count'])).trim();
const commitHash = (await this.git(['rev-parse', '--short', 'HEAD'])).trim();
return `${latestVersionTag}-${commitsCount}-g${commitHash}`;
} }
/** /**
* Returns whether there are uncommitted changes that are not ignored. * Returns whether there are uncommitted changes that are not ignored.
Generated Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -32,7 +32,7 @@
"@actions/core": "^1.10.1", "@actions/core": "^1.10.1",
"@actions/exec": "^1.1.1", "@actions/exec": "^1.1.1",
"@actions/github": "^6.0.0", "@actions/github": "^6.0.0",
"@kubernetes/client-node": "^1.0.0", "@kubernetes/client-node": "^0.16.3",
"@octokit/core": "^5.1.0", "@octokit/core": "^5.1.0",
"async-wait-until": "^2.0.12", "async-wait-until": "^2.0.12",
"aws-sdk": "^2.1081.0", "aws-sdk": "^2.1081.0",
+1 -15
View File
@@ -207,21 +207,7 @@ export default class Versioning {
* identifies the current commit. * identifies the current commit.
*/ */
static async getVersionDescription() { static async getVersionDescription() {
const versionTags = (await this.git(['tag', '--list', '--merged', 'HEAD', '--sort=-creatordate'])) return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
.split('\n')
.filter((tag) => new RegExp(this.grepCompatibleInputVersionRegex).test(tag));
if (versionTags.length === 0) {
core.warning('No valid version tags found. Using fallback description.');
return this.git(['describe', '--long', '--tags', '--always', 'HEAD']);
}
const latestVersionTag = versionTags[0];
const commitsCount = (await this.git(['rev-list', `${latestVersionTag}..HEAD`, '--count'])).trim();
const commitHash = (await this.git(['rev-parse', '--short', 'HEAD'])).trim();
return `${latestVersionTag}-${commitsCount}-g${commitHash}`;
} }
/** /**
+263 -325
View File
File diff suppressed because it is too large Load Diff