From 9f85a382581459fdf98a5bda4f872f5cbcb8b5b6 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 13:53:53 +0100 Subject: [PATCH 01/10] Added rule to not update major versions --- .github/renovate.json5 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 114e0c1436..7915d03c2d 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -28,11 +28,14 @@ ], "rollbackPrs": false }, - // Enable automerge for Bokken image updates { "matchDatasources": ["unity-bokken"], "automerge": false, }, + { + "matchUpdateTypes": ["minor", "patch", "pin", "digest"], + "description": "Disallow major version updates" + } ], } From cbe69414d9cd21ef0d4afa57b8c40e8db077d380 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 13:54:31 +0100 Subject: [PATCH 02/10] Removal of unused global.json file --- Tools/CI/global.json | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 Tools/CI/global.json diff --git a/Tools/CI/global.json b/Tools/CI/global.json deleted file mode 100644 index 3cb4f9622d..0000000000 --- a/Tools/CI/global.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "sdk": { - "version": "7.0.0", - "rollForward": "latestMinor", - "allowPrerelease": false - } -} From 92471a68939bd9ffaa03c869ad41e17d429a234e Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 14:56:07 +0100 Subject: [PATCH 03/10] Updated dependencies suggested by Renovate --- .github/workflows/conventional-pr.yml | 2 +- com.unity.netcode.gameobjects/package.json | 4 ++-- .../Packages/manifest.json | 4 ++-- testproject/Packages/manifest.json | 18 +++++++++--------- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml index ec3a6512e3..8b16e51656 100644 --- a/.github/workflows/conventional-pr.yml +++ b/.github/workflows/conventional-pr.yml @@ -17,7 +17,7 @@ jobs: steps: - name: semantic-pull-request # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below - uses: amannn/action-semantic-pull-request@b7a9a97cb10fa6e1ae02647e718798175f6b1f1d + uses: amannn/action-semantic-pull-request@b40166f00814508ec3201fc8595b393d451c8cd80 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index 0306a317f9..d16ea82560 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -5,8 +5,8 @@ "version": "1.12.2", "unity": "2021.3", "dependencies": { - "com.unity.nuget.mono-cecil": "1.10.1", - "com.unity.transport": "1.4.0" + "com.unity.nuget.mono-cecil": "1.11.5", + "com.unity.transport": "1.5.0" }, "samples": [ { diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 36f140fb51..075b75266e 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -3,8 +3,8 @@ "com.unity.ide.rider": "3.0.34", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.test-framework": "1.1.33", - "com.unity.test-framework.performance": "2.8.0-preview", + "com.unity.test-framework": "1.4.6", + "com.unity.test-framework.performance": "3.0.3", "com.unity.transport": "1.5.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index 646161b79c..b64f2d0b09 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,21 +1,21 @@ { "dependencies": { - "com.unity.addressables": "1.21.9", - "com.unity.ai.navigation": "1.1.1", + "com.unity.addressables": "1.23.1", + "com.unity.ai.navigation": "1.1.5", "com.unity.collab-proxy": "2.6.0", "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.mathematics": "1.2.6", + "com.unity.mathematics": "1.3.2", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.transport": "1.5.0", "com.unity.package-validation-suite": "0.49.0-preview", - "com.unity.services.authentication": "2.7.4", + "com.unity.services.authentication": "3.4.0", "com.unity.services.core": "1.14.0", - "com.unity.services.relay": "1.0.5", - "com.unity.test-framework": "1.3.3", - "com.unity.test-framework.performance": "2.8.1-preview", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.8.2", + "com.unity.services.relay": "1.1.1", + "com.unity.test-framework": "1.4.6", + "com.unity.test-framework.performance": "3.0.3", + "com.unity.textmeshpro": "3.0.9", + "com.unity.timeline": "1.8.8", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", From a314d50957b25b756e4e2360420e8b6a7b34f5ce Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Wed, 12 Feb 2025 15:02:38 +0100 Subject: [PATCH 04/10] Revereted amannn/action-semantic-pull-request --- .github/workflows/conventional-pr.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml index 8b16e51656..ec3a6512e3 100644 --- a/.github/workflows/conventional-pr.yml +++ b/.github/workflows/conventional-pr.yml @@ -17,7 +17,7 @@ jobs: steps: - name: semantic-pull-request # Internal Unity mirror available at jesseo/action-semantic-pull-request, but actions from private repos aren't supported, so continue to use the public one below - uses: amannn/action-semantic-pull-request@b40166f00814508ec3201fc8595b393d451c8cd80 + uses: amannn/action-semantic-pull-request@b7a9a97cb10fa6e1ae02647e718798175f6b1f1d env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: From a9473e6a7fd316bcee059334a34a38698727fa31 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Thu, 13 Feb 2025 13:30:19 +0100 Subject: [PATCH 05/10] Reverted com.unity.ai.navigation package bump --- testproject/Packages/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index b64f2d0b09..f116980a44 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,7 +1,7 @@ { "dependencies": { "com.unity.addressables": "1.23.1", - "com.unity.ai.navigation": "1.1.5", + "com.unity.ai.navigation": "1.1.1", "com.unity.collab-proxy": "2.6.0", "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", From 30e600e72086b402a776bc4ac690aa9660a2e30d Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Thu, 13 Feb 2025 15:09:04 +0100 Subject: [PATCH 06/10] Removed minimalproject dependency --- minimalproject/Packages/manifest.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json index 8079b5cadb..ea60805edb 100644 --- a/minimalproject/Packages/manifest.json +++ b/minimalproject/Packages/manifest.json @@ -1,7 +1,6 @@ { "dependencies": { - "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.transport": "1.5.0" + "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects" }, "testables": [ "com.unity.netcode.gameobjects" From 0405ec3f9b418b72aeb624f80081668897aea8f5 Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Thu, 13 Feb 2025 15:10:30 +0100 Subject: [PATCH 07/10] Corrected Renovate configuration so to update only packages versions compatible with mimimal supported editor --- .github/renovate.json5 | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 7915d03c2d..50110991ab 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,7 +7,7 @@ "local>Unity-Technologies/unity-renovate-config" ], "prConcurrentLimit": 100, - // Ignore commits produced by github actions workflows + // Ignore commits produced by Github actions workflows "gitIgnoredAuthors": ["githubaction@githubaction.com"], "ignorePaths": [ "**/node_modules/**", @@ -26,16 +26,9 @@ "schedule": [ "every weekend" ], - "rollbackPrs": false - }, - // Enable automerge for Bokken image updates - { - "matchDatasources": ["unity-bokken"], - "automerge": false, - }, - { - "matchUpdateTypes": ["minor", "patch", "pin", "digest"], - "description": "Disallow major version updates" + "rollbackPrs": false, + "editorCompatibilityCheckEnabled": true, + "minimumUnityVersion": "2021.3" } ], } From b44e9cc6f5f474d6dc00db31cf358f1bfe57b89f Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Fri, 14 Feb 2025 19:12:06 +0100 Subject: [PATCH 08/10] Updated renovate setup to not update package or testprojects --- .github/renovate.json5 | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 50110991ab..f8deee1505 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -1,18 +1,22 @@ { "baseBranches": ["develop", "develop-2.0.0"], "dependencyDashboard": true, - + "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ "local>Unity-Technologies/unity-renovate-config" ], "prConcurrentLimit": 100, - // Ignore commits produced by Github actions workflows + // Ignore commits produced by GitHub actions workflows "gitIgnoredAuthors": ["githubaction@githubaction.com"], "ignorePaths": [ "**/node_modules/**", // Don't renovate files in special folders using ~ as suffix - "**/*~/**" + "**/*~/**", + "com.unity.netcode.gameobjects/**/*", + "testproject/**/*", + "minimalproject/**/*", + "testproject-tools-integration/**/*" ], "packageRules": [ // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise @@ -27,8 +31,6 @@ "every weekend" ], "rollbackPrs": false, - "editorCompatibilityCheckEnabled": true, - "minimumUnityVersion": "2021.3" } ], } From 89eb2d8d0de82f6a3f0baa06e32dde8d785a73fa Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Fri, 14 Feb 2025 19:13:52 +0100 Subject: [PATCH 09/10] Reverted packages changes --- com.unity.netcode.gameobjects/package.json | 4 ++-- .../Packages/manifest.json | 4 ++-- testproject/Packages/manifest.json | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/com.unity.netcode.gameobjects/package.json b/com.unity.netcode.gameobjects/package.json index d16ea82560..b69c98f2c8 100644 --- a/com.unity.netcode.gameobjects/package.json +++ b/com.unity.netcode.gameobjects/package.json @@ -5,8 +5,8 @@ "version": "1.12.2", "unity": "2021.3", "dependencies": { - "com.unity.nuget.mono-cecil": "1.11.5", - "com.unity.transport": "1.5.0" + "com.unity.nuget.mono-cecil": "1.10.1", + "com.unity.transport": "1.4.0" }, "samples": [ { diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 075b75266e..36f140fb51 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -3,8 +3,8 @@ "com.unity.ide.rider": "3.0.34", "com.unity.multiplayer.tools": "1.1.1", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.test-framework": "1.4.6", - "com.unity.test-framework.performance": "3.0.3", + "com.unity.test-framework": "1.1.33", + "com.unity.test-framework.performance": "2.8.0-preview", "com.unity.transport": "1.5.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", diff --git a/testproject/Packages/manifest.json b/testproject/Packages/manifest.json index f116980a44..646161b79c 100644 --- a/testproject/Packages/manifest.json +++ b/testproject/Packages/manifest.json @@ -1,21 +1,21 @@ { "dependencies": { - "com.unity.addressables": "1.23.1", + "com.unity.addressables": "1.21.9", "com.unity.ai.navigation": "1.1.1", "com.unity.collab-proxy": "2.6.0", "com.unity.ide.rider": "3.0.34", "com.unity.ide.visualstudio": "2.0.22", - "com.unity.mathematics": "1.3.2", + "com.unity.mathematics": "1.2.6", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.transport": "1.5.0", "com.unity.package-validation-suite": "0.49.0-preview", - "com.unity.services.authentication": "3.4.0", + "com.unity.services.authentication": "2.7.4", "com.unity.services.core": "1.14.0", - "com.unity.services.relay": "1.1.1", - "com.unity.test-framework": "1.4.6", - "com.unity.test-framework.performance": "3.0.3", - "com.unity.textmeshpro": "3.0.9", - "com.unity.timeline": "1.8.8", + "com.unity.services.relay": "1.0.5", + "com.unity.test-framework": "1.3.3", + "com.unity.test-framework.performance": "2.8.1-preview", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.8.2", "com.unity.ugui": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", From a0b1476cce109601e1943d1f9ad872a46e59213d Mon Sep 17 00:00:00 2001 From: michalChrobot Date: Mon, 17 Feb 2025 11:56:56 +0100 Subject: [PATCH 10/10] Added Examples to ignore paths (present on develop-2.0.0) --- .github/renovate.json5 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index a4b6a851c1..923b574eed 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -16,7 +16,8 @@ "com.unity.netcode.gameobjects/**/*", "testproject/**/*", "minimalproject/**/*", - "testproject-tools-integration/**/*" + "testproject-tools-integration/**/*", + "Examples/**/*" ], "packageRules": [