From d24d6b764466881f8f045be3d08d2f420390d1f6 Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Fri, 26 Apr 2024 22:57:38 +0900 Subject: [PATCH 1/7] Rename repository --- .idea/.idea.UnityBuildReportAction/.idea/.gitignore | 13 ------------- .../.idea/encodings.xml | 4 ---- .../.idea/indexLayout.xml | 8 -------- .idea/.idea.UnityBuildReportAction/.idea/vcs.xml | 6 ------ ...ReportAction.meta => GhaUnityBuildReporter.meta} | 0 .../Editor.meta | 0 .../Editor/Bootstrap.cs} | 8 ++++---- .../Editor/Bootstrap.cs.meta} | 0 .../Editor/BuildReportRepository.cs | 2 +- .../Editor/BuildReportRepository.cs.meta | 0 .../Editor/EnvironmentVariableRepository.cs | 2 +- .../Editor/EnvironmentVariableRepository.cs.meta | 0 .../Editor/GitHubJobSummaryRepository.cs | 2 +- .../Editor/GitHubJobSummaryRepository.cs.meta | 0 .../Editor/IJobSummaryRepository.cs | 2 +- .../Editor/IJobSummaryRepository.cs.meta | 0 .../Editor/Preprocessor.cs | 4 ++-- .../Editor/Preprocessor.cs.meta | 0 .../Editor/ReportUnityBuildUseCase.cs | 2 +- .../Editor/ReportUnityBuildUseCase.cs.meta | 0 README.md | 2 +- 21 files changed, 12 insertions(+), 43 deletions(-) delete mode 100644 .idea/.idea.UnityBuildReportAction/.idea/.gitignore delete mode 100644 .idea/.idea.UnityBuildReportAction/.idea/encodings.xml delete mode 100644 .idea/.idea.UnityBuildReportAction/.idea/indexLayout.xml delete mode 100644 .idea/.idea.UnityBuildReportAction/.idea/vcs.xml rename Assets/{UnityBuildReportAction.meta => GhaUnityBuildReporter.meta} (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor.meta (100%) rename Assets/{UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs => GhaUnityBuildReporter/Editor/Bootstrap.cs} (82%) rename Assets/{UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs.meta => GhaUnityBuildReporter/Editor/Bootstrap.cs.meta} (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/BuildReportRepository.cs (98%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/BuildReportRepository.cs.meta (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/EnvironmentVariableRepository.cs (96%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/EnvironmentVariableRepository.cs.meta (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/GitHubJobSummaryRepository.cs (93%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/GitHubJobSummaryRepository.cs.meta (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/IJobSummaryRepository.cs (82%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/IJobSummaryRepository.cs.meta (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/Preprocessor.cs (82%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/Preprocessor.cs.meta (100%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/ReportUnityBuildUseCase.cs (99%) rename Assets/{UnityBuildReportAction => GhaUnityBuildReporter}/Editor/ReportUnityBuildUseCase.cs.meta (100%) diff --git a/.idea/.idea.UnityBuildReportAction/.idea/.gitignore b/.idea/.idea.UnityBuildReportAction/.idea/.gitignore deleted file mode 100644 index 8c8befc..0000000 --- a/.idea/.idea.UnityBuildReportAction/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/.idea.UnityBuildReportAction.iml -/modules.xml -/projectSettingsUpdater.xml -/contentModel.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.idea.UnityBuildReportAction/.idea/encodings.xml b/.idea/.idea.UnityBuildReportAction/.idea/encodings.xml deleted file mode 100644 index df87cf9..0000000 --- a/.idea/.idea.UnityBuildReportAction/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.UnityBuildReportAction/.idea/indexLayout.xml b/.idea/.idea.UnityBuildReportAction/.idea/indexLayout.xml deleted file mode 100644 index 7b08163..0000000 --- a/.idea/.idea.UnityBuildReportAction/.idea/indexLayout.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/.idea.UnityBuildReportAction/.idea/vcs.xml b/.idea/.idea.UnityBuildReportAction/.idea/vcs.xml deleted file mode 100644 index 35eb1dd..0000000 --- a/.idea/.idea.UnityBuildReportAction/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/Assets/UnityBuildReportAction.meta b/Assets/GhaUnityBuildReporter.meta similarity index 100% rename from Assets/UnityBuildReportAction.meta rename to Assets/GhaUnityBuildReporter.meta diff --git a/Assets/UnityBuildReportAction/Editor.meta b/Assets/GhaUnityBuildReporter/Editor.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor.meta rename to Assets/GhaUnityBuildReporter/Editor.meta diff --git a/Assets/UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs b/Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs similarity index 82% rename from Assets/UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs rename to Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs index 403e105..d822b0c 100644 --- a/Assets/UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs +++ b/Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs @@ -3,17 +3,17 @@ using UnityEditor; -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { [InitializeOnLoad] - internal sealed class EditorQuitEntryPoint + internal sealed class Bootstrap { internal static bool ExecutesUnityBuild; private static readonly string s_gitHubStepSummaryPath; - // The 'report' argument passed to IPostprocessBuildWithReport.OnPostprocessBuild() contains incorrect information, so read Library/LastBuild.buildreport instead. + // The 'report' argument passed to IPolsstprocessBuildWithReport.OnPostprocessBuild() contains incorrect information, so read Library/LastBuild.buildreport instead. // see: https://issuetracker.unity3d.com/issues/buildreport-report-in-ipostprocessbuildwithreport-provides-incorrect-information - static EditorQuitEntryPoint() + static Bootstrap() { s_gitHubStepSummaryPath = EnvironmentVariableRepository.GetGitHubStepSummaryPath(); diff --git a/Assets/UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs.meta b/Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/EditorQuitEntryPoint.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs.meta diff --git a/Assets/UnityBuildReportAction/Editor/BuildReportRepository.cs b/Assets/GhaUnityBuildReporter/Editor/BuildReportRepository.cs similarity index 98% rename from Assets/UnityBuildReportAction/Editor/BuildReportRepository.cs rename to Assets/GhaUnityBuildReporter/Editor/BuildReportRepository.cs index e1e00b8..545d7d0 100644 --- a/Assets/UnityBuildReportAction/Editor/BuildReportRepository.cs +++ b/Assets/GhaUnityBuildReporter/Editor/BuildReportRepository.cs @@ -8,7 +8,7 @@ using UnityEditor.Build.Reporting; using UnityEngine; -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { internal sealed class BuildReportRepository : IDisposable { diff --git a/Assets/UnityBuildReportAction/Editor/BuildReportRepository.cs.meta b/Assets/GhaUnityBuildReporter/Editor/BuildReportRepository.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/BuildReportRepository.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/BuildReportRepository.cs.meta diff --git a/Assets/UnityBuildReportAction/Editor/EnvironmentVariableRepository.cs b/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs similarity index 96% rename from Assets/UnityBuildReportAction/Editor/EnvironmentVariableRepository.cs rename to Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs index 684fca5..b5e58c3 100644 --- a/Assets/UnityBuildReportAction/Editor/EnvironmentVariableRepository.cs +++ b/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs @@ -4,7 +4,7 @@ using System; using UnityEngine; -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { internal sealed class EnvironmentVariableRepository { diff --git a/Assets/UnityBuildReportAction/Editor/EnvironmentVariableRepository.cs.meta b/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/EnvironmentVariableRepository.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs.meta diff --git a/Assets/UnityBuildReportAction/Editor/GitHubJobSummaryRepository.cs b/Assets/GhaUnityBuildReporter/Editor/GitHubJobSummaryRepository.cs similarity index 93% rename from Assets/UnityBuildReportAction/Editor/GitHubJobSummaryRepository.cs rename to Assets/GhaUnityBuildReporter/Editor/GitHubJobSummaryRepository.cs index 1e866cd..3286ee7 100644 --- a/Assets/UnityBuildReportAction/Editor/GitHubJobSummaryRepository.cs +++ b/Assets/GhaUnityBuildReporter/Editor/GitHubJobSummaryRepository.cs @@ -3,7 +3,7 @@ using System.IO; -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { internal sealed class GitHubJobSummaryRepository : IJobSummaryRepository { diff --git a/Assets/UnityBuildReportAction/Editor/GitHubJobSummaryRepository.cs.meta b/Assets/GhaUnityBuildReporter/Editor/GitHubJobSummaryRepository.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/GitHubJobSummaryRepository.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/GitHubJobSummaryRepository.cs.meta diff --git a/Assets/UnityBuildReportAction/Editor/IJobSummaryRepository.cs b/Assets/GhaUnityBuildReporter/Editor/IJobSummaryRepository.cs similarity index 82% rename from Assets/UnityBuildReportAction/Editor/IJobSummaryRepository.cs rename to Assets/GhaUnityBuildReporter/Editor/IJobSummaryRepository.cs index b3e727b..580eedb 100644 --- a/Assets/UnityBuildReportAction/Editor/IJobSummaryRepository.cs +++ b/Assets/GhaUnityBuildReporter/Editor/IJobSummaryRepository.cs @@ -1,7 +1,7 @@ // Copyright (c) 2020-2024 VeyronSakai. // This software is released under the MIT License. -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { internal interface IJobSummaryRepository { diff --git a/Assets/UnityBuildReportAction/Editor/IJobSummaryRepository.cs.meta b/Assets/GhaUnityBuildReporter/Editor/IJobSummaryRepository.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/IJobSummaryRepository.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/IJobSummaryRepository.cs.meta diff --git a/Assets/UnityBuildReportAction/Editor/Preprocessor.cs b/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs similarity index 82% rename from Assets/UnityBuildReportAction/Editor/Preprocessor.cs rename to Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs index 5e46ef2..35c18ed 100644 --- a/Assets/UnityBuildReportAction/Editor/Preprocessor.cs +++ b/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs @@ -4,7 +4,7 @@ using UnityEditor.Build; using UnityEditor.Build.Reporting; -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { internal sealed class Preprocessor : IPreprocessBuildWithReport { @@ -17,7 +17,7 @@ public void OnPreprocessBuild(BuildReport report) return; } - EditorQuitEntryPoint.ExecutesUnityBuild = true; + Bootstrap.ExecutesUnityBuild = true; } } } diff --git a/Assets/UnityBuildReportAction/Editor/Preprocessor.cs.meta b/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/Preprocessor.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs.meta diff --git a/Assets/UnityBuildReportAction/Editor/ReportUnityBuildUseCase.cs b/Assets/GhaUnityBuildReporter/Editor/ReportUnityBuildUseCase.cs similarity index 99% rename from Assets/UnityBuildReportAction/Editor/ReportUnityBuildUseCase.cs rename to Assets/GhaUnityBuildReporter/Editor/ReportUnityBuildUseCase.cs index 5133350..9ec7141 100644 --- a/Assets/UnityBuildReportAction/Editor/ReportUnityBuildUseCase.cs +++ b/Assets/GhaUnityBuildReporter/Editor/ReportUnityBuildUseCase.cs @@ -7,7 +7,7 @@ using UnityEditor.Build.Reporting; using UnityEngine; -namespace UnityBuildReportAction.Editor +namespace GhaUnityBuildReporter.Editor { internal sealed class ReportUnityBuildUseCase { diff --git a/Assets/UnityBuildReportAction/Editor/ReportUnityBuildUseCase.cs.meta b/Assets/GhaUnityBuildReporter/Editor/ReportUnityBuildUseCase.cs.meta similarity index 100% rename from Assets/UnityBuildReportAction/Editor/ReportUnityBuildUseCase.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/ReportUnityBuildUseCase.cs.meta diff --git a/README.md b/README.md index 6a2c0ea..dc8be15 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# UnityBuildReportAction +# GhaUnityBuildReporter From 87ab59f4b5fa9206c7d3fb0887ff735e6b8e4f20 Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Fri, 26 Apr 2024 23:48:10 +0900 Subject: [PATCH 2/7] Add Build Method --- .github/workflows/build.yml | 49 +++++++++--------- Assets/Editor.meta | 8 +++ Assets/Editor/BuildEntryPoint.cs | 20 ++++++++ Assets/Editor/BuildEntryPoint.cs.meta | 11 ++++ Packages/manifest.json | 8 +-- Packages/packages-lock.json | 72 ++++++++++++++------------- ProjectSettings/ProjectVersion.txt | 4 +- 7 files changed, 107 insertions(+), 65 deletions(-) create mode 100644 Assets/Editor.meta create mode 100644 Assets/Editor/BuildEntryPoint.cs create mode 100644 Assets/Editor/BuildEntryPoint.cs.meta diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a350cf5..e96a7e3 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,39 +1,40 @@ name: Build on: - push: - branches: - - main pull_request: workflow_dispatch: + inputs: + clean: + type: boolean + default: false + description: "clean" + +env: + CLEAN: ${{ github.event.inputs.clean || false }} concurrency: group: ${{ github.workflow }}-${{ github.ref }} cancel-in-progress: true jobs: - build: - if: ${{ github.event_name != 'push' }} + macos: runs-on: ubuntu-latest steps: + - name: Switch workspace + uses: DeNA/setup-job-workspace-action@v2 - uses: actions/checkout@v4 - - uses: actions/cache/restore@v4 with: - path: Library - key: ${{ runner.os }}-Library - - uses: VeyronSakai/unity-builder@main + clean: "${{ env.CLEAN }}" + - name: Get Unity version + run: | + echo "UNITY_VERSION=$(grep "m_EditorVersion:" < ProjectSettings/ProjectVersion.txt | cut -d" " -f2)" >> "${GITHUB_ENV}" + - name: Android Build env: - UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }} - UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }} - UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }} - with: - targetPlatform: Android - - cache: - if: ${{ github.event_name == 'push' }} - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: actions/cache/save@v4 - with: - path: Library - key: ${{ runner.os }}-Library + ANDROID_NDK_ROOT: "/Applications/Unity/Hub/Editor/${UNITY_VERSION}/PlaybackEngines/AndroidPlayer/NDK" + run: | + /Applications/Unity/Hub/Editor/"${UNITY_VERSION}"/Unity.app/Contents/MacOS/Unity \ + -quit \ + -batchmode \ + -nographics \ + -projectPath "$(pwd)" \ + -buildTarget Android \ + -executeMethod Editor.BuildEntryPoint.Build \ diff --git a/Assets/Editor.meta b/Assets/Editor.meta new file mode 100644 index 0000000..2b05782 --- /dev/null +++ b/Assets/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a6066a7755d984d488dc684a2753ef0d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/BuildEntryPoint.cs b/Assets/Editor/BuildEntryPoint.cs new file mode 100644 index 0000000..6eef5c9 --- /dev/null +++ b/Assets/Editor/BuildEntryPoint.cs @@ -0,0 +1,20 @@ +using UnityEditor; + +namespace Editor +{ + public sealed class BuildEntryPoint + { + public static void Build() + { + var buildPlayerOptions = new BuildPlayerOptions + { + scenes = new[] { "Assets/Scenes/SampleScene.unity" }, + locationPathName = "Outputs/Android/app.apk", + target = BuildTarget.Android, + options = BuildOptions.Development, + }; + + BuildPipeline.BuildPlayer(buildPlayerOptions); + } + } +} diff --git a/Assets/Editor/BuildEntryPoint.cs.meta b/Assets/Editor/BuildEntryPoint.cs.meta new file mode 100644 index 0000000..cf8abf2 --- /dev/null +++ b/Assets/Editor/BuildEntryPoint.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 33d6b57fc71a84989b3c521a03fdb56d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 9f1180d..859701e 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,11 +4,11 @@ "com.unity.feature.2d": "2.0.0", "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.test-framework": "1.1.33", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.7.6", - "com.unity.ugui": "1.0.0", + "com.unity.test-framework": "1.3.9", + "com.unity.timeline": "1.8.6", + "com.unity.ugui": "2.0.0", "com.unity.visualscripting": "1.9.2", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8b3d692..1247840 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,20 +1,20 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "9.1.0", + "version": "10.0.3", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "8.0.2", + "com.unity.2d.common": "9.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.collections": "1.1.0", + "com.unity.collections": "1.2.4", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.1.2", + "version": "1.0.1", "depth": 1, "source": "registry", "dependencies": { @@ -26,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "8.0.2", + "version": "9.0.2", "depth": 2, "source": "registry", "dependencies": { @@ -34,7 +34,7 @@ "com.unity.mathematics": "1.1.0", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.burst": "1.7.3" + "com.unity.burst": "1.8.4" }, "url": "https://packages.unity.com" }, @@ -46,12 +46,11 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "8.0.4", + "version": "9.0.1", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "9.1.0", - "com.unity.2d.common": "8.0.2", + "com.unity.2d.common": "9.0.2", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -63,12 +62,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "9.0.2", + "version": "10.0.2", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "8.0.1", + "com.unity.2d.common": "9.0.2", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -83,7 +82,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "3.1.2", + "version": "4.0.2", "depth": 1, "source": "registry", "dependencies": { @@ -95,12 +94,11 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.13", + "version": "1.8.10", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.mathematics": "1.2.1" }, "url": "https://packages.unity.com" }, @@ -122,7 +120,7 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, @@ -133,14 +131,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "9.1.0", + "com.unity.2d.animation": "10.0.3", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "8.0.4", + "com.unity.2d.psdimporter": "9.0.1", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "9.0.2", + "com.unity.2d.spriteshape": "10.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "3.1.2", - "com.unity.2d.aseprite": "1.1.2" + "com.unity.2d.tilemap.extras": "4.0.2", + "com.unity.2d.aseprite": "1.0.1" } }, "com.unity.ide.rider": { @@ -169,27 +167,18 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.1.33", + "version": "1.3.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", + "com.unity.ext.nunit": "2.0.3", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.timeline": { - "version": "1.7.6", + "version": "1.8.6", "depth": 0, "source": "registry", "dependencies": { @@ -201,7 +190,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -219,6 +208,12 @@ }, "url": "https://packages.unity.com" }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -266,6 +261,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -354,7 +355,8 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e3269c9..5773716 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.25f1 -m_EditorVersionWithRevision: 2022.3.25f1 (530ae0ba3889) +m_EditorVersion: 2023.2.1f1 +m_EditorVersionWithRevision: 2023.2.1f1 (a6dd9a634651) From 003dbda476ecdd1eee81a9a10d39e4ded1d11f1f Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Fri, 26 Apr 2024 23:57:45 +0900 Subject: [PATCH 3/7] Fix --- .../{Bootstrap.cs => EditorQuitEntryPoint.cs} | 4 +- ...p.cs.meta => EditorQuitEntryPoint.cs.meta} | 0 .../Editor/EnvironmentVariableRepository.cs | 3 - .../Editor/Preprocessor.cs | 2 +- Packages/manifest.json | 8 +-- Packages/packages-lock.json | 72 +++++++++---------- ProjectSettings/ProjectVersion.txt | 4 +- 7 files changed, 44 insertions(+), 49 deletions(-) rename Assets/GhaUnityBuildReporter/Editor/{Bootstrap.cs => EditorQuitEntryPoint.cs} (94%) rename Assets/GhaUnityBuildReporter/Editor/{Bootstrap.cs.meta => EditorQuitEntryPoint.cs.meta} (100%) diff --git a/Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs b/Assets/GhaUnityBuildReporter/Editor/EditorQuitEntryPoint.cs similarity index 94% rename from Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs rename to Assets/GhaUnityBuildReporter/Editor/EditorQuitEntryPoint.cs index d822b0c..f6946c7 100644 --- a/Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs +++ b/Assets/GhaUnityBuildReporter/Editor/EditorQuitEntryPoint.cs @@ -6,14 +6,14 @@ namespace GhaUnityBuildReporter.Editor { [InitializeOnLoad] - internal sealed class Bootstrap + internal sealed class EditorQuitEntryPoint { internal static bool ExecutesUnityBuild; private static readonly string s_gitHubStepSummaryPath; // The 'report' argument passed to IPolsstprocessBuildWithReport.OnPostprocessBuild() contains incorrect information, so read Library/LastBuild.buildreport instead. // see: https://issuetracker.unity3d.com/issues/buildreport-report-in-ipostprocessbuildwithreport-provides-incorrect-information - static Bootstrap() + static EditorQuitEntryPoint() { s_gitHubStepSummaryPath = EnvironmentVariableRepository.GetGitHubStepSummaryPath(); diff --git a/Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs.meta b/Assets/GhaUnityBuildReporter/Editor/EditorQuitEntryPoint.cs.meta similarity index 100% rename from Assets/GhaUnityBuildReporter/Editor/Bootstrap.cs.meta rename to Assets/GhaUnityBuildReporter/Editor/EditorQuitEntryPoint.cs.meta diff --git a/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs b/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs index b5e58c3..f0d2433 100644 --- a/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs +++ b/Assets/GhaUnityBuildReporter/Editor/EnvironmentVariableRepository.cs @@ -15,20 +15,17 @@ internal sealed class EnvironmentVariableRepository internal static string GetGitHubStepSummaryPath() { - Debug.Log($"{GitHubStepSummary}: {Environment.GetEnvironmentVariable(GitHubStepSummary)}"); return Environment.GetEnvironmentVariable(GitHubStepSummary); } internal static bool IsGitHubActions() { - Debug.Log($"{GitHubActions}: {Environment.GetEnvironmentVariable(GitHubActions)}"); return Environment.GetEnvironmentVariable(GitHubActions) == True; } internal static bool IsDisabled() { var envVar = Environment.GetEnvironmentVariable(GhaUnityBuildReporterOptOut); - Debug.Log($"{GhaUnityBuildReporterOptOut}: {envVar}"); return envVar?.ToLower() is True or "1"; } } diff --git a/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs b/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs index 35c18ed..b7b1caa 100644 --- a/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs +++ b/Assets/GhaUnityBuildReporter/Editor/Preprocessor.cs @@ -17,7 +17,7 @@ public void OnPreprocessBuild(BuildReport report) return; } - Bootstrap.ExecutesUnityBuild = true; + EditorQuitEntryPoint.ExecutesUnityBuild = true; } } } diff --git a/Packages/manifest.json b/Packages/manifest.json index 859701e..9f1180d 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,11 +4,11 @@ "com.unity.feature.2d": "2.0.0", "com.unity.ide.rider": "3.0.28", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.test-framework": "1.3.9", - "com.unity.timeline": "1.8.6", - "com.unity.ugui": "2.0.0", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.7.6", + "com.unity.ugui": "1.0.0", "com.unity.visualscripting": "1.9.2", - "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 1247840..8b3d692 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -1,20 +1,20 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "10.0.3", + "version": "9.1.0", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.2", + "com.unity.2d.common": "8.0.2", "com.unity.2d.sprite": "1.0.0", - "com.unity.collections": "1.2.4", + "com.unity.collections": "1.1.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.2d.aseprite": { - "version": "1.0.1", + "version": "1.1.2", "depth": 1, "source": "registry", "dependencies": { @@ -26,7 +26,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "9.0.2", + "version": "8.0.2", "depth": 2, "source": "registry", "dependencies": { @@ -34,7 +34,7 @@ "com.unity.mathematics": "1.1.0", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.burst": "1.8.4" + "com.unity.burst": "1.7.3" }, "url": "https://packages.unity.com" }, @@ -46,11 +46,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "9.0.1", + "version": "8.0.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "9.0.2", + "com.unity.2d.animation": "9.1.0", + "com.unity.2d.common": "8.0.2", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -62,12 +63,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "10.0.2", + "version": "9.0.2", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "9.0.2", + "com.unity.2d.common": "8.0.1", "com.unity.modules.physics2d": "1.0.0" }, "url": "https://packages.unity.com" @@ -82,7 +83,7 @@ } }, "com.unity.2d.tilemap.extras": { - "version": "4.0.2", + "version": "3.1.2", "depth": 1, "source": "registry", "dependencies": { @@ -94,11 +95,12 @@ "url": "https://packages.unity.com" }, "com.unity.burst": { - "version": "1.8.10", + "version": "1.8.13", "depth": 3, "source": "registry", "dependencies": { - "com.unity.mathematics": "1.2.1" + "com.unity.mathematics": "1.2.1", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, @@ -120,7 +122,7 @@ "url": "https://packages.unity.com" }, "com.unity.ext.nunit": { - "version": "2.0.5", + "version": "1.0.6", "depth": 1, "source": "registry", "dependencies": {}, @@ -131,14 +133,14 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "10.0.3", + "com.unity.2d.animation": "9.1.0", "com.unity.2d.pixel-perfect": "5.0.3", - "com.unity.2d.psdimporter": "9.0.1", + "com.unity.2d.psdimporter": "8.0.4", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "10.0.2", + "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", - "com.unity.2d.tilemap.extras": "4.0.2", - "com.unity.2d.aseprite": "1.0.1" + "com.unity.2d.tilemap.extras": "3.1.2", + "com.unity.2d.aseprite": "1.1.2" } }, "com.unity.ide.rider": { @@ -167,18 +169,27 @@ "url": "https://packages.unity.com" }, "com.unity.test-framework": { - "version": "1.3.9", + "version": "1.1.33", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "2.0.3", + "com.unity.ext.nunit": "1.0.6", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, "com.unity.timeline": { - "version": "1.8.6", + "version": "1.7.6", "depth": 0, "source": "registry", "dependencies": { @@ -190,7 +201,7 @@ "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "2.0.0", + "version": "1.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -208,12 +219,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.modules.accessibility": { - "version": "1.0.0", - "depth": 0, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -261,12 +266,6 @@ "com.unity.modules.animation": "1.0.0" } }, - "com.unity.modules.hierarchycore": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": {} - }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -355,8 +354,7 @@ "dependencies": { "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.hierarchycore": "1.0.0" + "com.unity.modules.jsonserialize": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 5773716..e3269c9 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2023.2.1f1 -m_EditorVersionWithRevision: 2023.2.1f1 (a6dd9a634651) +m_EditorVersion: 2022.3.25f1 +m_EditorVersionWithRevision: 2022.3.25f1 (530ae0ba3889) From a9b88f18d4cf40feb3f241e5f0d3da0fa5462f57 Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Sat, 27 Apr 2024 00:00:21 +0900 Subject: [PATCH 4/7] Fix --- Packages/manifest.json | 2 +- Packages/packages-lock.json | 2 +- ProjectSettings/ProjectVersion.txt | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Packages/manifest.json b/Packages/manifest.json index 9f1180d..67b6675 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -8,7 +8,7 @@ "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.6", "com.unity.ugui": "1.0.0", - "com.unity.visualscripting": "1.9.2", + "com.unity.visualscripting": "1.9.4", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 8b3d692..7c6659f 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -210,7 +210,7 @@ } }, "com.unity.visualscripting": { - "version": "1.9.2", + "version": "1.9.4", "depth": 0, "source": "registry", "dependencies": { diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index e3269c9..9f9a533 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2022.3.25f1 -m_EditorVersionWithRevision: 2022.3.25f1 (530ae0ba3889) +m_EditorVersion: 2022.3.26f1 +m_EditorVersionWithRevision: 2022.3.26f1 (ec6cd8118806) From 3161514f74b4e04dd37a507cf80a430deeab2ef8 Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Sat, 27 Apr 2024 00:04:41 +0900 Subject: [PATCH 5/7] Fix workflow --- .github/workflows/{build.yml => build-test.yml} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename .github/workflows/{build.yml => build-test.yml} (94%) diff --git a/.github/workflows/build.yml b/.github/workflows/build-test.yml similarity index 94% rename from .github/workflows/build.yml rename to .github/workflows/build-test.yml index e96a7e3..b0097a8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build-test.yml @@ -1,4 +1,4 @@ -name: Build +name: BuildTest on: pull_request: workflow_dispatch: @@ -16,8 +16,8 @@ concurrency: cancel-in-progress: true jobs: - macos: - runs-on: ubuntu-latest + android: + runs-on: [self-hosted, macOS] steps: - name: Switch workspace uses: DeNA/setup-job-workspace-action@v2 From 570aaf89e35ef30444125f417f28554d4cd857cd Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Sat, 27 Apr 2024 00:11:13 +0900 Subject: [PATCH 6/7] Update setup-job-workspace --- .github/workflows/build-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index b0097a8..46f6b42 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -20,7 +20,7 @@ jobs: runs-on: [self-hosted, macOS] steps: - name: Switch workspace - uses: DeNA/setup-job-workspace-action@v2 + uses: DeNA/setup-job-workspace-action@fea4ef4d011492fe235833241acbb4fced82da27 - uses: actions/checkout@v4 with: clean: "${{ env.CLEAN }}" From 9eacd65f60d0895a62b2c68a0b87fcf015700e8e Mon Sep 17 00:00:00 2001 From: VeyronSakai Date: Sat, 27 Apr 2024 00:18:59 +0900 Subject: [PATCH 7/7] Add iOS Build Job --- .github/workflows/build-test.yml | 25 +++++++++++++++++++++++-- Assets/Editor/BuildEntryPoint.cs | 18 +++++++++++++++++- 2 files changed, 40 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-test.yml b/.github/workflows/build-test.yml index 46f6b42..42b9173 100644 --- a/.github/workflows/build-test.yml +++ b/.github/workflows/build-test.yml @@ -36,5 +36,26 @@ jobs: -batchmode \ -nographics \ -projectPath "$(pwd)" \ - -buildTarget Android \ - -executeMethod Editor.BuildEntryPoint.Build \ + -executeMethod Editor.BuildEntryPoint.BuildAndroid + + ios: + runs-on: [self-hosted, macOS] + steps: + - name: Switch workspace + uses: DeNA/setup-job-workspace-action@fea4ef4d011492fe235833241acbb4fced82da27 + - uses: actions/checkout@v4 + with: + clean: "${{ env.CLEAN }}" + - name: Get Unity version + run: | + echo "UNITY_VERSION=$(grep "m_EditorVersion:" < ProjectSettings/ProjectVersion.txt | cut -d" " -f2)" >> "${GITHUB_ENV}" + - name: iOS Build + env: + ANDROID_NDK_ROOT: "/Applications/Unity/Hub/Editor/${UNITY_VERSION}/PlaybackEngines/AndroidPlayer/NDK" + run: | + /Applications/Unity/Hub/Editor/"${UNITY_VERSION}"/Unity.app/Contents/MacOS/Unity \ + -quit \ + -batchmode \ + -nographics \ + -projectPath "$(pwd)" \ + -executeMethod Editor.BuildEntryPoint.BuildIOS \ diff --git a/Assets/Editor/BuildEntryPoint.cs b/Assets/Editor/BuildEntryPoint.cs index 6eef5c9..12dcb3f 100644 --- a/Assets/Editor/BuildEntryPoint.cs +++ b/Assets/Editor/BuildEntryPoint.cs @@ -2,9 +2,11 @@ namespace Editor { + // ReSharper disable once UnusedMember.Global public sealed class BuildEntryPoint { - public static void Build() + // ReSharper disable once UnusedMember.Global + public static void BuildAndroid() { var buildPlayerOptions = new BuildPlayerOptions { @@ -16,5 +18,19 @@ public static void Build() BuildPipeline.BuildPlayer(buildPlayerOptions); } + + // ReSharper disable once UnusedMember.Global + public static void BuildIOS() + { + var buildPlayerOptions = new BuildPlayerOptions + { + scenes = new[] { "Assets/Scenes/SampleScene.unity" }, + locationPathName = "Outputs/IOS/", + target = BuildTarget.iOS, + options = BuildOptions.Development, + }; + + BuildPipeline.BuildPlayer(buildPlayerOptions); + } } }