Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9bdc57fd88 | ||
|
|
c346eef5b2 | ||
|
|
a4eebd0393 | ||
|
|
2ef9ad827b | ||
|
|
ece3f072dd | ||
|
|
afc58da579 |
@@ -31,12 +31,12 @@ jobs:
|
|||||||
cat "$machine_id_file" > /etc/machine-id
|
cat "$machine_id_file" > /etc/machine-id
|
||||||
echo "Unity machine identity restored"
|
echo "Unity machine identity restored"
|
||||||
fi
|
fi
|
||||||
|
git config --global url."https://ghfast.top/https://github.com/".insteadOf "https://github.com/"
|
||||||
unity_bin="$(command -v unity-editor || command -v unity || command -v Unity || true)"
|
unity_bin="$(command -v unity-editor || command -v unity || command -v Unity || true)"
|
||||||
test -n "$unity_bin"
|
test -n "$unity_bin"
|
||||||
"$unity_bin" \
|
"$unity_bin" \
|
||||||
-batchmode \
|
-batchmode \
|
||||||
-nographics \
|
-nographics \
|
||||||
-quit \
|
|
||||||
-projectPath "$PWD/Development~/UnityProject" \
|
-projectPath "$PWD/Development~/UnityProject" \
|
||||||
-runTests \
|
-runTests \
|
||||||
-testPlatform EditMode \
|
-testPlatform EditMode \
|
||||||
|
|||||||
@@ -11,5 +11,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"com.unity.test-framework": "1.1.33",
|
"com.unity.test-framework": "1.1.33",
|
||||||
"com.cneicy.shrink-installer": "file:../../.."
|
"com.cneicy.shrink-installer": "file:../../.."
|
||||||
}
|
},
|
||||||
|
"testables": [
|
||||||
|
"com.cneicy.shrink-installer"
|
||||||
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -82,7 +82,12 @@ namespace ShrinkSDK.Installer
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
SetStatus("Package diagnostics failed: " + request.Error.message, MessageType.Warning);
|
var errorMessage = request.Error?.message;
|
||||||
|
SetStatus(
|
||||||
|
string.IsNullOrWhiteSpace(errorMessage)
|
||||||
|
? "Package diagnostics did not complete while Unity was resolving packages. Refresh diagnostics after resolution completes."
|
||||||
|
: "Package diagnostics failed: " + errorMessage,
|
||||||
|
MessageType.Warning);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -92,6 +97,7 @@ namespace ShrinkSDK.Installer
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
ShrinkSdkManifestStore.EnsureShrinkSdkRegistry();
|
ShrinkSdkManifestStore.EnsureShrinkSdkRegistry();
|
||||||
|
_listRequest = null;
|
||||||
Client.Resolve();
|
Client.Resolve();
|
||||||
SetStatus("Registry configuration written. Unity is resolving packages.", MessageType.Info);
|
SetStatus("Registry configuration written. Unity is resolving packages.", MessageType.Info);
|
||||||
}
|
}
|
||||||
@@ -106,6 +112,7 @@ namespace ShrinkSDK.Installer
|
|||||||
try
|
try
|
||||||
{
|
{
|
||||||
ShrinkSdkManifestStore.EnsurePackageInstallation(entry);
|
ShrinkSdkManifestStore.EnsurePackageInstallation(entry);
|
||||||
|
_listRequest = null;
|
||||||
Client.Resolve();
|
Client.Resolve();
|
||||||
SetStatus(
|
SetStatus(
|
||||||
"Pinned " + entry.PackageName + " " + entry.Version + " in Packages/manifest.json. Unity is resolving packages.",
|
"Pinned " + entry.PackageName + " " + entry.Version + " in Packages/manifest.json. Unity is resolving packages.",
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ namespace ShrinkSDK.Installer
|
|||||||
internal static readonly ShrinkSdkPackageEntry StarterBasic = new(
|
internal static readonly ShrinkSdkPackageEntry StarterBasic = new(
|
||||||
"ShrinkApp Starter Basic",
|
"ShrinkApp Starter Basic",
|
||||||
"com.cneicy.shrink-app-starter-basic",
|
"com.cneicy.shrink-app-starter-basic",
|
||||||
"0.1.0",
|
"0.1.2",
|
||||||
requiresUniTask: true);
|
requiresUniTask: true);
|
||||||
|
|
||||||
internal static readonly IReadOnlyList<ShrinkSdkPackageEntry> Packages = new[]
|
internal static readonly IReadOnlyList<ShrinkSdkPackageEntry> Packages = new[]
|
||||||
@@ -43,7 +43,7 @@ namespace ShrinkSDK.Installer
|
|||||||
new ShrinkSdkPackageEntry("ShrinkCommand Integration App", "com.cneicy.shrink-command-integration-app", "0.1.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkCommand Integration App", "com.cneicy.shrink-command-integration-app", "0.1.0", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkCommand Integration EventBus", "com.cneicy.shrink-command-integration-eventbus", "0.1.1", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkCommand Integration EventBus", "com.cneicy.shrink-command-integration-eventbus", "0.1.1", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkCommand Integration Network", "com.cneicy.shrink-command-integration-network", "0.1.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkCommand Integration Network", "com.cneicy.shrink-command-integration-network", "0.1.0", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkContext App Adapter", "com.cneicy.shrink-context-app-adapter", "0.1.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkContext App Adapter", "com.cneicy.shrink-context-app-adapter", "0.1.2", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkContext Core", "com.cneicy.shrink-context-core", "0.1.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkContext Core", "com.cneicy.shrink-context-core", "0.1.0", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkContext EventBus Adapter", "com.cneicy.shrink-context-eventbus-adapter", "0.1.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkContext EventBus Adapter", "com.cneicy.shrink-context-eventbus-adapter", "0.1.0", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkDataSaver", "com.cneicy.shrink-datasaver", "2.2.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkDataSaver", "com.cneicy.shrink-datasaver", "2.2.0", requiresUniTask: true),
|
||||||
@@ -56,7 +56,7 @@ namespace ShrinkSDK.Installer
|
|||||||
new ShrinkSdkPackageEntry("ShrinkNetwork Integration App", "com.cneicy.shrink-network-integration-app", "0.1.0", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkNetwork Integration App", "com.cneicy.shrink-network-integration-app", "0.1.0", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkNetwork Integration EventBus", "com.cneicy.shrink-network-integration-eventbus", "0.1.1", requiresUniTask: true),
|
new ShrinkSdkPackageEntry("ShrinkNetwork Integration EventBus", "com.cneicy.shrink-network-integration-eventbus", "0.1.1", requiresUniTask: true),
|
||||||
new ShrinkSdkPackageEntry("ShrinkShared CodeGen", "com.cneicy.shrink-shared-codegen", "0.1.0"),
|
new ShrinkSdkPackageEntry("ShrinkShared CodeGen", "com.cneicy.shrink-shared-codegen", "0.1.0"),
|
||||||
new ShrinkSdkPackageEntry("ShrinkTutorial", "com.cneicy.shrink-tutorial", "0.1.0")
|
new ShrinkSdkPackageEntry("ShrinkTutorial", "com.cneicy.shrink-tutorial", "0.1.1")
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,5 @@ The installer does not copy templates into `Assets`, does not store credentials,
|
|||||||
## Bootstrap URL
|
## Bootstrap URL
|
||||||
|
|
||||||
```text
|
```text
|
||||||
https://git.crash.work/ShrinkSDK/Installer.git#v0.1.3
|
https://git.crash.work/ShrinkSDK/Installer.git#v0.1.7
|
||||||
```
|
```
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "com.cneicy.shrink-installer",
|
"name": "com.cneicy.shrink-installer",
|
||||||
"version": "0.1.3",
|
"version": "0.1.7",
|
||||||
"displayName": "ShrinkSDK Installer",
|
"displayName": "ShrinkSDK Installer",
|
||||||
"description": "ShrinkSDK registry bootstrapper and fixed-version package installer.",
|
"description": "ShrinkSDK registry bootstrapper and fixed-version package installer.",
|
||||||
"unity": "2022.3",
|
"unity": "2022.3",
|
||||||
|
|||||||
Reference in New Issue
Block a user