Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions common/config/azure-pipelines/jobs/fast-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,15 @@ jobs:
# This note indicates that changes from the ESLint deprecation rule must be reviewed
# and approved before continuing with the release process.
commitId="$(Build.SourceVersion)"
deprecationCommentChangesRegex="DEPRECATION_COMMENT_CHANGES"
deprecationCommentChangesRegex="DEPRECATION_COMMENT_CHANGES_PR"
if [[ "$(getCommit.notes)" =~ $deprecationCommentChangesRegex ]]; then
echo "$commitId has deprecation comment changes that should be reviewed before release"
echo '##vso[task.setvariable variable=shouldRequireApproval;isOutput=true]true'
else
echo "$commitId doesn't have any deprecation comment changes that need reviewal"
echo '##vso[task.setvariable variable=shouldRequireApproval;isOutput=true]false'
fi
displayName: Parse DEPRECATION_COMMENT_CHANGES note
displayName: Parse DEPRECATION_COMMENT_CHANGES_PR note
name: deprecationCommentNote

- job: WaitForCodeChangeValidation
Expand Down Expand Up @@ -214,6 +214,8 @@ jobs:
steps:
- checkout: self
clean: true
timeoutInMinutes: 5
retryCountOnTaskFailure: 1
- template: ../templates/core-build.yaml
parameters:
nodeVersion: 22.x
Expand Down
14 changes: 5 additions & 9 deletions common/config/azure-pipelines/jobs/version-bump.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -332,10 +332,6 @@ jobs:
env:
GH_TOKEN: $(GITHUBTOKEN)

- ${{ if or(eq(parameters.BumpType, 'minor'), eq(parameters.BumpType, 'patch')) }}:
- bash: 'git tag -a release/$(getVersion.version) -m "v$(getVersion.version)"'
displayName: Create git tag

- bash: git fetch https://$(GITHUBTOKEN)@github.com/iTwin/itwinjs-core refs/notes/commits:refs/notes/commits
displayName: git fetch refs/notes/commits
continueOnError: true
Expand All @@ -348,20 +344,20 @@ jobs:

- bash: |
latestCommit=$(git log -1 --format=%H)
echo "Applying DEPRECATION_COMMENT_CHANGES note to commit $latestCommit"
git notes append -m "DEPRECATION_COMMENT_CHANGES" $latestCommit
echo "Applying DEPRECATION_COMMENT_CHANGES_PR note to commit $latestCommit"
git notes append -m "DEPRECATION_COMMENT_CHANGES_PR" $latestCommit
displayName: Mark commit for eslint rule changes
condition: eq(variables['deprecationCommentChangesMade'], 'true')
condition: eq(variables['needsPR'], 'true')

- bash: |
git push https://$(GITHUBTOKEN)@github.com/iTwin/itwinjs-core refs/notes/commits
displayName: git push refs/notes/commits

- bash: "git push --follow-tags https://$(GITHUBTOKEN)@github.com/iTwin/itwinjs-core $(releaseBranchName)"
- bash: "git push https://$(GITHUBTOKEN)@github.com/iTwin/itwinjs-core $(releaseBranchName)"
displayName: Push version bump for release candidate
condition: eq('${{ parameters.BumpType }}', 'releaseCandidate')

- bash: "git push --follow-tags https://$(GITHUBTOKEN)@github.com/iTwin/itwinjs-core HEAD:$(Build.SourceBranch)"
- bash: "git push https://$(GITHUBTOKEN)@github.com/iTwin/itwinjs-core HEAD:$(Build.SourceBranch)"
displayName: Push version bump for non-release candidate
condition: ne('${{ parameters.BumpType }}', 'releaseCandidate')

Expand Down
4 changes: 4 additions & 0 deletions common/config/azure-pipelines/templates/core-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@ steps:
- script: node common/scripts/install-run-rush.js install
displayName: rush install
workingDirectory: ${{ parameters.workingDir }}
timeoutInMinutes: 5
retryCountOnTaskFailure: 1

- script: node common/scripts/install-run-rush.js audit
displayName: rush audit
Expand Down Expand Up @@ -122,6 +124,7 @@ steps:
env:
NODE_ENV: development
condition: and(succeeded(), eq(variables['Agent.OS'], 'Linux'))
retryCountOnTaskFailure: 1

# MacOS and Windows agents work without any virtual display
- script: node common/scripts/install-run-rush.js cover --verbose
Expand All @@ -130,6 +133,7 @@ steps:
env:
NODE_ENV: development
condition: and(succeeded(), ne(variables['Agent.OS'], 'Linux'))
retryCountOnTaskFailure: 1

- script: node common/scripts/install-run-rush.js docs
displayName: rush docs
Expand Down
Loading