Skip to content

Commit 9f7d9cf

Browse files
hl662hl662
authored
Merge branch 'master' into nam/fix-stale-5-1-9-deprecations
2 parents c7a4d63 + a59280d commit 9f7d9cf

45 files changed

Lines changed: 61 additions & 45 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎common/config/azure-pipelines/jobs/version-bump.yaml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,22 @@ jobs:
216216
displayName: rush audit
217217

218218
- ${{ if or(eq(parameters.BumpType, 'minor'), eq(parameters.BumpType, 'patch')) }}:
219+
- bash: |
220+
# Keep this aligned with the version policy used by the release version bump steps below.
221+
versionPolicyName=prerelease-monorepo-lockStep
222+
currentVersion=$(jq -r --arg policyName "$versionPolicyName" '.[] | select(.policyName == $policyName) | .version' common/config/rush/version-policies.json)
223+
if [ -z "$currentVersion" ] || [ "$currentVersion" = "null" ]; then
224+
echo "Failed to find version policy '$versionPolicyName' in common/config/rush/version-policies.json" >&2
225+
exit 1
226+
fi
227+
# Deprecation comments require a released minor/patch version like 5.10.0, not a prerelease suffix like 5.10.0-dev.10.
228+
# For non-prerelease versions, this parameter expansion leaves the version unchanged.
229+
deprecationVersion=${currentVersion%%-*}
230+
sed -i "s/\(addVersion: \"\)[^\"]*/\1$deprecationVersion/" common/config/eslint/eslint.config.deprecation-policy.js
231+
echo "Using deprecation addVersion=$deprecationVersion from version policy $versionPolicyName"
232+
echo "##vso[task.setvariable variable=deprecationVersion]$deprecationVersion"
233+
displayName: Sync deprecation policy addVersion to current version
234+
219235
- bash: node common/scripts/install-run-rush.js lint-deprecation
220236
displayName: rush lint-deprecation
221237

@@ -236,7 +252,7 @@ jobs:
236252
displayName: Determine whether ESLint rule made any changes
237253
238254
- bash: |
239-
git commit -m "Apply deprecation date rule"
255+
git commit -m "Apply deprecation date rule for v$(deprecationVersion)"
240256
displayName: Commit deprecation comment changes to release branch
241257
condition: eq(variables['deprecationCommentChangesMade'], 'true')
242258

‎common/config/rush/version-policies.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"policyName": "prerelease-monorepo-lockStep",
44
"definitionName": "lockStepVersion",
5-
"version": "5.10.0-dev.10",
5+
"version": "5.10.0-dev.11",
66
"nextBump": "prerelease"
77
}
88
]

‎core/backend/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/core-backend",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "iTwin.js backend components",
55
"main": "lib/cjs/core-backend.js",
66
"module": "lib/esm/core-backend.js",

‎core/bentley/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/core-bentley",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "Bentley JavaScript core components",
55
"main": "lib/cjs/core-bentley.js",
66
"module": "lib/esm/core-bentley.js",

‎core/common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/core-common",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "iTwin.js components common to frontend and backend",
55
"main": "lib/cjs/core-common.js",
66
"module": "lib/esm/core-common.js",

‎core/ecschema-editing/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/ecschema-editing",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "ECSchema editing and validation API",
55
"license": "MIT",
66
"main": "lib/cjs/ecschema-editing.js",

‎core/ecschema-locaters/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/ecschema-locaters",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "EC Schema file locaters",
55
"license": "MIT",
66
"main": "lib/cjs/ecschema-locaters.js",

‎core/ecschema-metadata/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/ecschema-metadata",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "ECObjects core concepts in typescript",
55
"license": "MIT",
66
"main": "lib/cjs/ecschema-metadata.js",

‎core/ecschema-rpc/common/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/ecschema-rpcinterface-common",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "Schema RPC Interface common interface",
55
"main": "lib/cjs/ecschema-rpc-interface.js",
66
"module": "lib/esm/ecschema-rpc-interface.js",

‎core/ecschema-rpc/impl/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@itwin/ecschema-rpcinterface-impl",
3-
"version": "5.10.0-dev.10",
3+
"version": "5.10.0-dev.11",
44
"description": "Schema RPC Interface backend implementation",
55
"main": "lib/cjs/ecschema-rpc-impl.js",
66
"module": "lib/esm/ecschema-rpc-impl.js",

0 commit comments

Comments
 (0)