-
Notifications
You must be signed in to change notification settings - Fork 227
Refactor eng/common/README.md #1178
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.
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
Merged
2 commits merged into
Azure:master
from
chidozieononiwu:feature/RefactorEngCommonWorkflow
Nov 10, 2020
Merged
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -28,4 +28,38 @@ contact [[email protected]](mailto:[email protected]) with any additio | |
|
|
||
| [](https://dev.azure.com/azure-sdk/internal/_build/latest?definitionId=1372&branchName=master) | ||
|
|
||
| ## Common Engineering System | ||
|
|
||
| The `eng/common` directory contains engineering files that are common across the various azure-sdk language repos. | ||
| It should remain relatively small and only contain textual based files like scripts, configs, or templates. It | ||
| should not contain binary files as they don't play well with git. | ||
|
|
||
| ### Code Structure | ||
|
|
||
| To help keep the content of the `eng/common` directory as small as possible we should split the language specific parts of a common script out if possible. | ||
| - Keep the language specific logic as a function in the `eng/scripts/Language-Settings.ps1` files found in each language repo. | ||
| - Assign the function name to a variable in the `eng/common/scripts/common.ps1` file. | ||
| - Call the function using the variable name like so `&$VariableName`. | ||
|
|
||
| ### Updating | ||
|
|
||
| Any updates to files in the `eng/common` directory should be made in the [azure-sdk-tools](https://github.com/azure/azure-sdk-tools) repo. | ||
| All changes made will cause a PR to created in all subscribed azure-sdk language repos which will blindly replace all contents of | ||
| the `eng/common` directory in that repo. For that reason do **NOT** make changes to files in this directory in the individual azure-sdk | ||
| languages repos as they will be overwritten the next time an update is taken from the common azure-sdk-tools repo. | ||
|
|
||
| ### Workflow | ||
|
|
||
| The 'Sync eng/common directory' PRs will be created in the language repositories when a pull request that touches the eng/common directory is submitted against the master branch. This will make it easier for changes to be tested in each individual language repo before merging the changes in the azure-sdk-tools repo. The workflow is explained below: | ||
|
|
||
| 1. Create a PR (**Tools PR**) in the `azure-sdk-tools` repo with changes to eng/common directory. | ||
| 2. `azure-sdk-tools - sync - eng-common` pipeline is triggered for the **Tools PR** | ||
| 3. The `azure-sdk-tools - sync - eng-common` pipeline queues test runs for template pipelines in various languages. These help you test your changes in the **Tools PR**. | ||
| 4. If there are changes in the **Tools PR** that will affect the release stage you should approve the release test pipelines by clicking the approval gate. The test (template) pipeline will automatically release the next eligible version without needing manual intervention for the versioning. Please approve your test releases as quickly as possible. A race condition may occur due to someone else queueing the pipeline and going all the way to release using your version while yours is still waiting. If this occurs manually rerun the pipeline that failed. | ||
| 5. If you make additional changes to your **Tools PR** repeat steps 1 - 4 until you have completed the necessary testing of your changes. This includes full releases of the template package, if necessary. | ||
| 6. Sign off on CreateSyncPRs stage of the sync pipeline using the approval gate. This stage will create the **Sync PRs** in the various language repos. A link to each of the **Sync PRs** will show up in the **Tools PR** for you to click and review. | ||
| 7. Go review and approve each of your **Sync PRs**. | ||
| 8. Sign Off on the VerifyAndMerge stage. This will merge any remaining open **Sync PR** and also append `auto-merge` to the **Tools PR**. | ||
| * If a **Sync PR** has any failing checks, it will need to be manually merged, even if `/check-enforcer override` has been run ([azure-sdk-tools#1147](https://github.com/Azure/azure-sdk-tools/issues/1147)). | ||
|
|
||
| C:/repo/sdk-tools/packages/java-packages/snippet-replacer-maven-plugin | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,2 @@ | ||
| # Common Engineering System | ||
|
|
||
| The `eng/common` directory contains engineering files that are common across the various azure-sdk language repos. | ||
| It should remain relatively small and only contain textual based files like scripts, configs, or templates. It | ||
| should not contain binary files as they don't play well with git. | ||
|
|
||
| ## Updating | ||
|
|
||
| Any updates to files in the `eng/common` directory should be made in the [azure-sdk-tools](https://github.com/azure/azure-sdk-tools) repo. | ||
| All changes made will cause a PR to created in all subscribed azure-sdk language repos which will blindly replace all contents of | ||
| the `eng/common` directory in that repo. For that reason do **NOT** make changes to files in this directory in the individual azure-sdk | ||
| languages repos as they will be overwritten the next time an update is taken from the common azure-sdk-tools repo. | ||
|
|
||
| ### Workflow | ||
|
|
||
| The 'Sync eng/common directory' PRs will be created in the language repositories when a pull request that touches the eng/common directory is submitted against the master branch. This will make it easier for changes to be tested in each individual language repo before merging the changes in the azure-sdk-tools repo. The workflow is explained below: | ||
|
|
||
| 1. Create a PR (**Tools PR**) in the `azure-sdk-tools` repo with changes to eng/common directory. | ||
| 2. `azure-sdk-tools - sync - eng-common` pipeline is triggered for the **Tools PR** | ||
| 3. The `azure-sdk-tools - sync - eng-common` pipeline queues test runs for template pipelines in various languages. These help you test your changes in the **Tools PR**. | ||
| 4. If there are changes in the **Tools PR** that will affect the release stage you should approve the release test pipelines by clicking the approval gate. The test (template) pipeline will automatically release the next eligible version without needing manual intervention for the versioning. Please approve your test releases as quickly as possible. A race condition may occur due to someone else queueing the pipeline and going all the way to release using your version while yours is still waiting. If this occurs manually rerun the pipeline that failed. | ||
| 5. If you make additional changes to your **Tools PR** repeat steps 1 - 4 until you have completed the necessary testing of your changes. This includes full releases of the template package, if necessary. | ||
| 6. Sign off on CreateSyncPRs stage of the sync pipeline using the approval gate. This stage will create the **Sync PRs** in the various language repos. A link to each of the **Sync PRs** will show up in the **Tools PR** for you to click and review. | ||
| 7. Go review and approve each of your **Sync PRs**. | ||
| 8. Sign Off on the VerifyAndMerge stage. This will merge any remaining open **Sync PR** and also append `auto-merge` to the **Tools PR**. | ||
| * If a **Sync PR** has any failing checks, it will need to be manually merged, even if `/check-enforcer override` has been run ([azure-sdk-tools#1147](https://github.com/Azure/azure-sdk-tools/issues/1147)). | ||
| ## Common Engineering System | ||
| See [common engineering system docs](https://github.com/Azure/azure-sdk-tools/blob/master/README.md#common-engineering-system) | ||
chidozieononiwu marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.