From 52d98e97e9eef16722f7507e9ac811db2c8575f3 Mon Sep 17 00:00:00 2001 From: Miguel Alonso Jr Date: Wed, 20 Mar 2024 14:01:29 -0400 Subject: [PATCH 1/2] Reverted webgl editor test to 2022.3 until further investigation. --- .yamato/standalone-build-webgl-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.yamato/standalone-build-webgl-test.yml b/.yamato/standalone-build-webgl-test.yml index 4c27e11cd6..6f363c92af 100644 --- a/.yamato/standalone-build-webgl-test.yml +++ b/.yamato/standalone-build-webgl-test.yml @@ -1,4 +1,4 @@ -{% capture editor_version %}2023.2{% endcapture %} +{% capture editor_version %}2022.3{% endcapture %} test_webgl_standalone_{{ editor_version }}: name: Test WebGL Standalone {{ editor_version }} agent: From 503706904d30922b1a28f224d248ef86361ebe6f Mon Sep 17 00:00:00 2001 From: Miguel Alonso Jr Date: Thu, 21 Mar 2024 08:27:46 -0400 Subject: [PATCH 2/2] Fixed the issue with webgl build test and 2023.2. --- .yamato/sonar-python-package.yml | 2 +- .../SharedAssets/Scripts/Exclude.meta | 8 +++++++ .../Scripts/Exclude/Exclude.asmdef | 21 +++++++++++++++++++ .../Scripts/Exclude/Exclude.asmdef.meta | 7 +++++++ .../Scripts/{ => Exclude}/ModelCarousel.cs | 0 .../{ => Exclude}/ModelCarousel.cs.meta | 0 6 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude.meta create mode 100644 Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef create mode 100644 Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef.meta rename Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/{ => Exclude}/ModelCarousel.cs (100%) rename Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/{ => Exclude}/ModelCarousel.cs.meta (100%) diff --git a/.yamato/sonar-python-package.yml b/.yamato/sonar-python-package.yml index a087afe56a..be5f747e0b 100644 --- a/.yamato/sonar-python-package.yml +++ b/.yamato/sonar-python-package.yml @@ -2,7 +2,7 @@ csharp: name: Sonarqube Scan for ml-agents python repo agent: type: Unity::metal::macmini - image: package-ci/mac:v1.8.1-822785 + image: package-ci/macos-13:v4 flavor: m1.mac variables: SONARQUBE_PROJECT_KEY: ai-ml-agents-toolkit diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude.meta b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude.meta new file mode 100644 index 0000000000..6caf384e98 --- /dev/null +++ b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18b00320e9f0e4fbaabb3fb91d936526 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef new file mode 100644 index 0000000000..631f884bb6 --- /dev/null +++ b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef @@ -0,0 +1,21 @@ +{ + "name": "Exclude", + "rootNamespace": "", + "references": [ + "GUID:6055be8ebefd69e48b49212b09b47b2f", + "GUID:c98377141161c7746a178fb5cb1af075", + "GUID:85e0054f8e64b47309646d35f8851f81", + "GUID:847b179520b009e4c8d15c296b1cbf35" + ], + "includePlatforms": [ + "Editor" + ], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef.meta b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef.meta new file mode 100644 index 0000000000..b616485049 --- /dev/null +++ b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/Exclude.asmdef.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f0861913ad94b42159f7f3643aaa6452 +AssemblyDefinitionImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ModelCarousel.cs b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/ModelCarousel.cs similarity index 100% rename from Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ModelCarousel.cs rename to Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/ModelCarousel.cs diff --git a/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ModelCarousel.cs.meta b/Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/ModelCarousel.cs.meta similarity index 100% rename from Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/ModelCarousel.cs.meta rename to Project/Assets/ML-Agents/Examples/SharedAssets/Scripts/Exclude/ModelCarousel.cs.meta