Skip to content

Commit cd356b4

Browse files
committed
Add 3.x.x everywhere and delete all packages-lock
1 parent e2acc6c commit cd356b4

13 files changed

Lines changed: 13 additions & 1971 deletions

File tree

.github/renovate.json5

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"baseBranches": ["develop", "develop-2.0.0"],
2+
"baseBranches": ["develop", "develop-2.0.0", "develop-3.x.x"],
33
"dependencyDashboard": true,
44

55
"$schema": "https://docs.renovatebot.com/renovate-schema.json",

.github/workflows/autoupdate.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
branches:
55
- develop
66
- develop-2.0.0
7+
- develop-3.x.x
78
jobs:
89
autoupdate:
910
name: auto-update

.github/workflows/pr-description-validation.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ on:
1414
branches:
1515
- develop
1616
- develop-2.0.0
17+
- develop-3.x.x
1718
- release/*
1819

1920
jobs:
@@ -29,14 +30,14 @@ jobs:
2930
script: |
3031
const pr = context.payload.pull_request;
3132
const body = pr.body || '';
32-
33+
3334
// List of users to skip description validation
3435
// This should be automations where we don't care that much about the description format
3536
const skipUsersPrefixes = [
3637
'unity-renovate',
3738
'svc-'
3839
];
39-
40+
4041
// If PR author is in the skip list, exit early
4142
const author = pr.user.login;
4243
console.log(`PR author: ${author}`);
@@ -49,7 +50,7 @@ jobs:
4950
const requiredSections = [
5051
{
5152
header: '## Backports',
52-
description: 'PR description must include a "## Backports" section. Please add this section and provide information about this PR backport to develop or develop-2.0.0 branch respectively or explain why backport is not needed.'
53+
description: 'PR description must include a "## Backports" section. Please add this section and provide information about this PR backport to develop, develop-2.0.0 or develop-3.x.x branch respectively or explain why backport is not needed.'
5354
},
5455
{
5556
header: '## Testing & QA',

.github/workflows/pr-supervisor.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# We are using https://cli.github.com/manual/gh_pr_checks
33
# The aim is to ensure that conditionally triggered Yamato jobs are completed successfully before allowing merges
44

5-
# This job will be required in branch protection rules for develop, develop-2.0.0, and release/* branches. It's only goal will be to ensure that Yamato jobs are completed successfully before allowing Pr to merge.
5+
# This job will be required in branch protection rules for develop, develop-2.0.0, develop-3.x.x, and release/* branches. It's only goal will be to ensure that Yamato jobs are completed successfully before allowing Pr to merge.
66
# Note that conditional jobs will have 30s to show which is always the cas since they are showing up as soon as in distribution stage.
77

88
name: Yamato PR Supervisor

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,5 @@ utr.bat
1212
Tools/CI/bin
1313
Tools/CI/obj
1414

15+
# Do not include the packages-lock file
16+
packages-lock.json

.yamato/_triggers.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
# 1) Minimal PR checks that run on all PRs (even if only docs are changed)
1818
# 2) More extensive pr_code_changes_checks that run if code is changed. This test validates Standards, Package tests, Project tests and Desktop standalone tests to ensure that main platforms are covered
1919
# By default pr_minimal_required_checks it's triggered if
20-
# 1) PR targets develop, develop-2.0.0 or release branches
20+
# 1) PR targets develop, develop-2.0.0, develop-3.x.x or release branches
2121
# 2) PR is not a draft
2222
# Then pr_code_changes_checks it's triggered if the same conditions apply plus:
2323
# 1) PR changes code in com.unity.netcode.gameobjects package (Editor, Runtime or Tests folders) or in testproject folder or package.json file

Examples/CharacterControllerMovingBodies/Packages/manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"com.unity.ide.rider": "3.0.38",
1111
"com.unity.ide.visualstudio": "2.0.25",
1212
"com.unity.multiplayer.center": "1.0.0",
13-
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-2.0.0",
13+
"com.unity.netcode.gameobjects": "https://github.com/Unity-Technologies/com.unity.netcode.gameobjects.git?path=com.unity.netcode.gameobjects#develop-3.x.x",
1414
"com.unity.purchasing": "4.12.2",
1515
"com.unity.services.multiplayer": "1.2.0",
1616
"com.unity.test-framework": "1.6.0",

0 commit comments

Comments
 (0)