Skip to content

Fix FromSource_SkipRebuild_Verify dependency resolution failures #48475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
raych1 wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −18
Draft

Fix FromSource_SkipRebuild_Verify dependency resolution failures #48475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion eng/pipelines/code-quality-reports.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ extends:
displayName: 'Generate FromSource POM and directories for sparse checkout'
inputs:
scriptPath: 'eng/scripts/generate_from_source_pom.py'
arguments: '--set-skip-linting-projects SkipLintingProjects --artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList)'
arguments: '--set-skip-linting-projects SkipLintingProjects --artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList) --match-any-version'
workingDirectory: '$(System.DefaultWorkingDirectory)'

- template: /eng/common/pipelines/templates/steps/sparse-checkout.yml
Expand Down
4 changes: 2 additions & 2 deletions eng/pipelines/templates/stages/archetype-sdk-client-patch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ extends:
displayName: 'Generate FromSource POM and directories for sparse checkout'
inputs:
scriptPath: 'eng/scripts/generate_from_source_pom.py'
arguments: '--artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList)'
arguments: '--artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList) --match-any-version'
workingDirectory: '$(System.DefaultWorkingDirectory)'

- template: /eng/pipelines/templates/steps/sparse-checkout-repo-initialized.yml
Expand Down Expand Up @@ -242,7 +242,7 @@ extends:
displayName: 'Generate FromSource POM and directories for sparse checkout'
inputs:
scriptPath: 'eng/scripts/generate_from_source_pom.py'
arguments: '--artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList)'
arguments: '--artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList) --match-any-version'
workingDirectory: '$(System.DefaultWorkingDirectory)'

- template: /eng/pipelines/templates/steps/sparse-checkout-repo-initialized.yml
Expand Down
34 changes: 19 additions & 15 deletions eng/pipelines/templates/steps/initialize-test-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,20 +34,6 @@ steps:
parameters:
AgentImage: ${{ parameters.OS }}

- task: PythonScript@0
displayName: 'Set versions for source build'
inputs:
scriptPath: 'eng/versioning/set_versions.py'
arguments: '--prep-source-testing'
condition: and(succeeded(), eq(variables['TestFromSource'], 'true'))

- task: PythonScript@0
displayName: 'Update versions for source build'
inputs:
scriptPath: 'eng/versioning/update_versions.py'
arguments: '--skip-readme'
condition: and(succeeded(), eq(variables['TestFromSource'], 'true'))

- template: /eng/pipelines/templates/steps/generate-project-list-and-cache-maven-repository.yml
parameters:
JobType: 'test'
Expand All @@ -69,14 +55,32 @@ steps:
# is for FromSource runs or, in the case of code quality reports, a run that needs to build
# everything using the latest source. It'll greedily set any service directories as it figures
# out what libraries, their dependents and so on, that need to be in ClientFromSourcePom.xml
# NOTE: This must run BEFORE set_versions/update_versions so that version_client.txt still has
# the original dependency versions. With --match-any-version, the script matches POM dependency
# versions against both the released (dependency) and development (current) versions, ensuring
# all inter-repo dependencies are correctly identified even when they differ.
- task: PythonScript@0
displayName: 'Generate FromSource POM and directories for sparse checkout'
inputs:
scriptPath: 'eng/scripts/generate_from_source_pom.py'
arguments: '--artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList)'
arguments: '--artifacts-list $(ArtifactsList) --additional-modules-list $(AdditionalModulesList) --match-any-version'
workingDirectory: '$(System.DefaultWorkingDirectory)'
condition: and(succeeded(), eq(variables['TestFromSource'], 'true'))

- task: PythonScript@0
displayName: 'Set versions for source build'
inputs:
scriptPath: 'eng/versioning/set_versions.py'
arguments: '--prep-source-testing'
condition: and(succeeded(), eq(variables['TestFromSource'], 'true'))

- task: PythonScript@0
displayName: 'Update versions for source build'
inputs:
scriptPath: 'eng/versioning/update_versions.py'
arguments: '--skip-readme'
condition: and(succeeded(), eq(variables['TestFromSource'], 'true'))

# Skip sparse checkout for the `azure-sdk-for-<lang>-pr` private mirrored repositories
# as we require the GitHub service connection to be loaded.
- ${{ if not(contains(variables['Build.DefinitionName'], 'java-pr')) }}:
Expand Down
Loading