Skip to content
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

Jump to bottom

Fix service directory computation for ci.yml file being in the library directory #43154

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Fix service directory computation for ci.yml file being in the library directory #43154

merged 1 commit into from
Dec 2, 2024

Conversation

JimSuplizio
Copy link
Member

@JimSuplizio JimSuplizio commented Dec 2, 2024 •
edited
Loading

Changes were made a few weeks back to fix PackageInfo generation. In the cases where the ci.yml file is in the library's directory instead of the root service directory, the ServiceDirectories in the ci.yml files was updated. Patch release is special in that it needs to compute the list of service directories from the library list. The problem was that it always assumed that 1 level up from the project's path was the service directory which is no longer the case.

The list of ServiceDirectories is used, in the archetype-sdk-client-patch.yml to generate the PackageInfo which now has to be more granular if the ci.yml is in the library directory.

To ensure normal operations aren't affected I've run the following pipelines which both passed without issue.

  1. java - template - ci - ci.yml is at the ServiceDirectory level
  2. java - azure-communication-common - ci - ci.yml is at the library level

@JimSuplizio JimSuplizio self-assigned this Dec 2, 2024
@JimSuplizio JimSuplizio requested a review from mssfang December 2, 2024 20:02
scbedd
scbedd approved these changes Dec 2, 2024
View reviewed changes
Copy link
Member

@scbedd scbedd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see where you're going with this. I think you're probably ok given that the situation I mention in comment doesn't actually exist in main right now.

Thanks Jim 👍

@JimSuplizio
Copy link
Member Author

As per the description, I've listed the two pipelines I've run to test this. There are no pipelines triggered off this file. As such, I'm going to merge this.

@JimSuplizio JimSuplizio merged commit 012c897 into Azure:main Dec 2, 2024
13 of 14 checks passed
mssfang pushed a commit that referenced this pull request Dec 3, 2024
@JimSuplizio @mssfang
Fix service directory computation for ci.yml file being in the librar…
5d320a8 
…y directory (#43154)
mssfang added a commit that referenced this pull request Dec 4, 2024
@azure-sdk @mssfang
@alzimmermsft @JimSuplizio
Prepare patch release 20241126 (#43108)
466fe8f 
* Updated list of libraries to patch in patch-release.yml

* Reset sources for azure-communication-common to the release version 1.3.8.

* Prepare azure-communication-common for 1.3.9 patch release.

* Reset sources for azure-data-schemaregistry to the release version 1.5.1.

* Prepare azure-data-schemaregistry for 1.5.2 patch release.

* Reset sources for azure-developer-devcenter to the release version 1.0.5.

* Prepare azure-developer-devcenter for 1.0.6 patch release.

* Reset sources for azure-monitor-ingestion to the release version 1.2.6.

* Prepare azure-monitor-ingestion for 1.2.7 patch release.

* Reset sources for azure-messaging-eventhubs-checkpointstore-blob to the release version 1.20.1.

* Prepare azure-messaging-eventhubs-checkpointstore-blob for 1.20.2 patch release.

* Reset sources for azure-search-documents to the release version 11.7.3.

* Prepare azure-search-documents for 11.7.4 patch release.

* Reset sources for azure-security-keyvault-secrets to the release version 4.9.0.

* Prepare azure-security-keyvault-secrets for 4.9.1 patch release.

* Reset sources for azure-messaging-webpubsub-client to the release version 1.0.8.

* Prepare azure-messaging-webpubsub-client for 1.0.9 patch release.

* Reset sources for azure-messaging-eventhubs to the release version 5.19.1.

* Prepare azure-messaging-eventhubs for 5.19.2 patch release.

* Reset sources for azure-ai-metricsadvisor to the release version 1.2.3.

* Prepare azure-ai-metricsadvisor for 1.2.4 patch release.

* Reset sources for azure-security-attestation to the release version 1.1.29.

* Prepare azure-security-attestation for 1.1.30 patch release.

* Reset sources for azure-communication-sms to the release version 1.1.29.

* Prepare azure-communication-sms for 1.1.30 patch release.

* Reset sources for azure-storage-common to the release version 12.28.0.

* Prepare azure-storage-common for 12.28.1 patch release.

* Reset sources for azure-data-appconfiguration to the release version 1.7.2.

* Prepare azure-data-appconfiguration for 1.7.3 patch release.

* Reset sources for azure-storage-queue to the release version 12.24.0.

* Prepare azure-storage-queue for 12.24.1 patch release.

* Reset sources for azure-messaging-servicebus to the release version 7.17.6.

* Prepare azure-messaging-servicebus for 7.17.7 patch release.

* Reset sources for azure-communication-identity to the release version 1.6.1.

* Prepare azure-communication-identity for 1.6.2 patch release.

* Reset sources for azure-security-keyvault-certificates to the release version 4.7.0.

* Prepare azure-security-keyvault-certificates for 4.7.1 patch release.

* Reset sources for azure-messaging-webpubsub to the release version 1.3.2.

* Prepare azure-messaging-webpubsub for 1.3.3 patch release.

* Reset sources for azure-identity-extensions to the release version 1.1.21.

* Prepare azure-identity-extensions for 1.1.22 patch release.

* Reset sources for azure-security-confidentialledger to the release version 1.0.25.

* Prepare azure-security-confidentialledger for 1.0.26 patch release.

* Reset sources for azure-mixedreality-remoterendering to the release version 1.1.34.

* Prepare azure-mixedreality-remoterendering for 1.1.35 patch release.

* Reset sources for azure-storage-blob-cryptography to the release version 12.28.0.

* Prepare azure-storage-blob-cryptography for 12.28.1 patch release.

* Reset sources for azure-communication-messages to the release version 1.1.0.

* Prepare azure-communication-messages for 1.1.1 patch release.

* Reset sources for azure-ai-contentsafety to the release version 1.0.8.

* Prepare azure-ai-contentsafety for 1.0.9 patch release.

* Reset sources for azure-data-schemaregistry-apacheavro to the release version 1.1.22.

* Prepare azure-data-schemaregistry-apacheavro for 1.1.23 patch release.

* Reset sources for azure-communication-chat to the release version 1.5.6.

* Prepare azure-communication-chat for 1.5.7 patch release.

* Reset sources for azure-communication-callautomation to the release version 1.3.0.

* Prepare azure-communication-callautomation for 1.3.1 patch release.

* Reset sources for azure-mixedreality-authentication to the release version 1.2.29.

* Prepare azure-mixedreality-authentication for 1.2.30 patch release.

* Reset sources for azure-storage-file-share to the release version 12.25.0.

* Prepare azure-storage-file-share for 12.25.1 patch release.

* Reset sources for azure-security-keyvault-keys to the release version 4.9.0.

* Prepare azure-security-keyvault-keys for 4.9.1 patch release.

* Reset sources for azure-communication-rooms to the release version 1.1.7.

* Prepare azure-communication-rooms for 1.1.8 patch release.

* Reset sources for azure-security-keyvault-administration to the release version 4.6.0.

* Prepare azure-security-keyvault-administration for 4.6.1 patch release.

* Reset sources for azure-storage-internal-avro to the release version 12.14.0.

* Prepare azure-storage-internal-avro for 12.14.1 patch release.

* Reset sources for azure-communication-jobrouter to the release version 1.1.9.

* Prepare azure-communication-jobrouter for 1.1.10 patch release.

* Reset sources for azure-storage-file-datalake to the release version 12.22.0.

* Prepare azure-storage-file-datalake for 12.22.1 patch release.

* Reset sources for azure-storage-blob-batch to the release version 12.25.0.

* Prepare azure-storage-blob-batch for 12.25.1 patch release.

* Reset sources for azure-monitor-query to the release version 1.5.3.

* Prepare azure-monitor-query for 1.5.4 patch release.

* Reset sources for azure-containers-containerregistry to the release version 1.2.13.

* Prepare azure-containers-containerregistry for 1.2.14 patch release.

* Reset sources for azure-iot-deviceupdate to the release version 1.0.23.

* Prepare azure-iot-deviceupdate for 1.0.24 patch release.

* Reset sources for azure-ai-textanalytics to the release version 5.5.3.

* Prepare azure-ai-textanalytics for 5.5.4 patch release.

* Reset sources for azure-communication-email to the release version 1.0.18.

* Prepare azure-communication-email for 1.0.19 patch release.

* Reset sources for azure-developer-loadtesting to the release version 1.0.18.

* Prepare azure-developer-loadtesting for 1.0.19 patch release.

* Reset sources for azure-storage-blob to the release version 12.29.0.

* Prepare azure-storage-blob for 12.29.1 patch release.

* Reset sources for azure-communication-phonenumbers to the release version 1.1.18.

* Prepare azure-communication-phonenumbers for 1.1.19 patch release.

* Patch release preparation 20241126

* merge 858932a and 3a2377d

* run mvn in AppConfiguration

* run mvn in Attestation

* run mvn in contentsafety etc

* cherry-pick 86971ec

* run mvn eventhub packages

* run mvn deviceupdates package

* cherry-pick 843c8ef

* mvn run identity extension

* revert remove test dependency changes in container registry

* cherry-pick da00a5f

* regen kv

* cherry-pick d899fa7

* cherry-pick 6fecdca

* cherry-pick ea44eda

* Ensure Get-AllPkgProperties handles ci.yml below sdk/<service>

* regenerate call automation

* regenerate call chat

* regenerate communication common

* regenerate communication email

* regenerate communication identity

* regenerate communication job router

* regenerate communication messages

* regenerate communication phone numbers

* regenerate communication rooms

* regenerate communication sms

* regenerate Container Registry

* regenerate load testing and kv

* revert kv changes

* regene metric advisor

* not release storage patches

* revert scottb changes

* Fix service directory computation for ci.yml file being in the library directory (#43154)

* rerun maven in text analytics sdk

* rerun maven in mixedreality authentication sdk

* rerun maven in monitor sdk

* rerun maven in schemaregistry sdk

* rerun maven in webpubsub sdk

* rerun maven in monitor query sdk

* rerun maven in serch sdk

* rerun maven in webpubsub client sdk

* rerun maven in schemaregistry-apacheavro client sdk

* rerun maven in mixedreality-remoterendering client sdk

* update release date

* testing with scottb's one line changes

* remove removed parameters

* Increment package versions for patch releases (#43195)

---------

Co-authored-by: Shawn Fang <[email protected]>
Co-authored-by: Alan Zimmer <[email protected]>
Co-authored-by: James Suplizio <[email protected]>
@JimSuplizio JimSuplizio deleted the FixServDirForYmlInLibDir branch December 5, 2024 16:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scbedd scbedd scbedd approved these changes

@alzimmermsft alzimmermsft Awaiting requested review from alzimmermsft

@hallipr hallipr Awaiting requested review from hallipr hallipr is a code owner

@weshaggard weshaggard Awaiting requested review from weshaggard weshaggard is a code owner

@benbp benbp Awaiting requested review from benbp benbp is a code owner

@mssfang mssfang Awaiting requested review from mssfang

Assignees

@JimSuplizio JimSuplizio

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@JimSuplizio @scbedd