diff --git a/.github/renovate.json5 b/.github/renovate.json5 index acab47d6f0..1b96abd02f 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -7,15 +7,19 @@ "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/**/*", + "Examples/**/*", + "testproject/**/*", + "minimalproject/**/*", + "testproject-tools-integration/**/*" ], "packageRules": [ - // Run unity-upm-project and unity-upm-package only on weekends to reduce PR noise // Also ensure dependencies won't be downgraded when they don't exist in the public repositories { @@ -27,13 +31,7 @@ "schedule": [ "every weekend" ], - "rollbackPrs": false - }, - - // Enable automerge for Bokken image updates - { - "matchDatasources": ["unity-bokken"], - "automerge": false, - }, + "rollbackPrs": false, + } ], } diff --git a/.github/workflows/conventional-pr.yml b/.github/workflows/conventional-pr.yml index 6090fe2ab2..e5b2504dca 100644 --- a/.github/workflows/conventional-pr.yml +++ b/.github/workflows/conventional-pr.yml @@ -18,7 +18,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@40166f00814508ec3201fc8595b393d451c8cd80 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: 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 - } -} diff --git a/minimalproject/Packages/manifest.json b/minimalproject/Packages/manifest.json index 9c4ac7a7ee..b01ba5d497 100644 --- a/minimalproject/Packages/manifest.json +++ b/minimalproject/Packages/manifest.json @@ -1,9 +1,6 @@ { "dependencies": { - "com.unity.ai.navigation": "2.0.5", - "com.unity.multiplayer.center": "1.0.0", - "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", - "com.unity.modules.accessibility": "1.0.0" + "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects" }, "testables": [ "com.unity.netcode.gameobjects" diff --git a/testproject-tools-integration/Packages/manifest.json b/testproject-tools-integration/Packages/manifest.json index 86bed9f664..d0841aedff 100644 --- a/testproject-tools-integration/Packages/manifest.json +++ b/testproject-tools-integration/Packages/manifest.json @@ -4,7 +4,7 @@ "com.unity.ai.navigation": "2.0.5", "com.unity.ide.rider": "3.0.31", "com.unity.multiplayer.center": "1.0.0", - "com.unity.multiplayer.tools": "https://github.com/Unity-Technologies/com.unity.multiplayer.tools.git#release/1.1.0", + "com.unity.multiplayer.tools": "2.2.3", "com.unity.netcode.gameobjects": "file:../../com.unity.netcode.gameobjects", "com.unity.test-framework": "1.4.6", "com.unity.test-framework.performance": "3.0.3",