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.

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

Change storage account staging root to build version #5532

Merged
merged 1 commit into from
Oct 16, 2023

Conversation

jander-msft
Copy link
Member

Summary

This changes the staging directory on the staging account to use the unstable build version instead of the build number. The motivation for this change is to make it easier to look up the assets purely based on the build version instead of also requiring the build number e.g. dotnet-docker updates can rely on build version only if the updater needs to put checksums from the staging account.

Example difference:

-https://<account>.blob.core.windows.net/dotnet-monitor/20231012.2/BlobAssets/dotnet-monitor-base-8.0.0-rtm.23512.2-linux-x64.tar.gz
+https://<account>.blob.core.windows.net/dotnet-monitor/8.0.0-rtm.23512.2/BlobAssets/dotnet-monitor-base-8.0.0-rtm.23512.2-linux-x64.tar.gz

In the above example, the number after the dotnet-monitor container changed from the build number (20231012.2) to the build version (8.0.0-rtm.23512.2).

Validation build: https://dev.azure.com/dnceng/internal/_build/results?buildId=2290054&view=results
Validation release: https://dev.azure.com/dnceng/internal/_build/results?buildId=2290231&view=results

Release Notes Entry

@jander-msft jander-msft added servicing-patch Servicing fixes that is targeted for a patch release (0.0.x version) servicing-minor Servicing fixes that is targeted for a minor release (0.x.0 version) servicing-major Servicing fixes that is targeted for a major release (x.0.0 version) labels Oct 13, 2023
@jander-msft jander-msft requested a review from a team as a code owner October 13, 2023 00:11
@ghost ghost added the needs-review label Oct 13, 2023
@ghost ghost removed the needs-review label Oct 13, 2023
@jander-msft jander-msft merged commit 6eadf67 into dotnet:main Oct 16, 2023
@jander-msft jander-msft deleted the account-build-version branch October 16, 2023 22:20
@jander-msft
Copy link
Member Author

/backport to release/7.x

@github-actions
Copy link
Contributor

Started backporting to release/7.x: https://github.com/dotnet/dotnet-monitor/actions/runs/6539915502

@github-actions
Copy link
Contributor

@jander-msft backporting to release/7.x failed, the patch most likely resulted in conflicts.

Please backport manually using one of the below commands, followed by git am --continue once the merge conflict has been resolved.

PowerShell

(Invoke-WebRequest "https://github.com/dotnet/dotnet-monitor/commit/6eadf676f9a6d364e0d9add51336e87a9d340c02.patch").Content | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch

Bash

curl -sSL "https://github.com/dotnet/dotnet-monitor/commit/6eadf676f9a6d364e0d9add51336e87a9d340c02.patch" | git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch

git am error output:

$ git am --3way --ignore-whitespace --exclude="documentation/**.md" --keep-non-patch changes.patch

Applying: Change storage account staging root to build version (#5532)
Using index info to reconstruct a base tree...
M	dotnet-monitor.yml
M	eng/pipelines/dotnet-monitor-release.yml
M	eng/pipelines/stages/preparerelease.yml
M	eng/release/Scripts/PublishToBlobAccounts.ps1
Falling back to patching base and 3-way merge...
Auto-merging eng/release/Scripts/PublishToBlobAccounts.ps1
Auto-merging eng/pipelines/stages/preparerelease.yml
Auto-merging eng/pipelines/dotnet-monitor-release.yml
Auto-merging dotnet-monitor.yml
CONFLICT (content): Merge conflict in dotnet-monitor.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Change storage account staging root to build version (#5532)
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Error: The process '/usr/bin/git' failed with exit code 128

@jander-msft jander-msft removed servicing-patch Servicing fixes that is targeted for a patch release (0.0.x version) servicing-minor Servicing fixes that is targeted for a minor release (0.x.0 version) servicing-major Servicing fixes that is targeted for a major release (x.0.0 version) labels Oct 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants