Skip to content

Conversation

@dotnet-maestro
Copy link
Contributor

@dotnet-maestro dotnet-maestro bot commented Feb 15, 2024

This pull request updates the following dependencies

From https://github.com/dotnet/emsdk

  • Subscription: 662e2218-ac3b-45e0-0adc-08d961c5a36b
  • Build: 20240227.3
  • Date Produced: February 27, 2024 1:53:08 PM UTC
  • Commit: ee3546a41338fd3c82167b62d7ff989934c6cb01
  • Branch: refs/heads/release/6.0

…15.4

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.28 -> To Version 6.0.28
@ghost ghost added the area-codeflow for labeling automated codeflow label Feb 15, 2024
@carlossanlop carlossanlop added the Servicing-approved Approved for servicing release label Feb 22, 2024
…27.3

Microsoft.NET.Workload.Emscripten.Manifest-6.0.100 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.300 , Microsoft.NET.Workload.Emscripten.Manifest-6.0.400
 From Version 6.0.28 -> To Version 6.0.28
@akoeplinger
Copy link
Member

This was merged to release/6.0-staging with #98438, closing this one.

@akoeplinger akoeplinger closed this Mar 7, 2024
@akoeplinger akoeplinger deleted the darc-release/6.0-d4154fbd-2aa6-4cc3-9c96-77afd016210f branch March 7, 2024 17:08
@carlossanlop
Copy link
Contributor

@akoeplinger @lewing I usually merge them on both sides, but it's always causing merge conflicts when flowing code from one branch to another.

Do you have any objections if I disable the emsdk subscriptions that go to the base branches and only leave enabled the ones that flow into the staging branches?

@lewing
Copy link
Member

lewing commented Mar 7, 2024

works for me

@akoeplinger
Copy link
Member

yeah sounds good, I never understood why we had both

@carlossanlop
Copy link
Contributor

Great, thanks! Done, I disabled all 3: release/6.0, release/7.0, release/8.0. Confirmed that the 3 staging ones are still enabled.

If we ever need it urgently, we can always manually trigger the base ones.

@github-actions github-actions bot locked and limited conversation to collaborators Apr 7, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

area-codeflow for labeling automated codeflow Servicing-approved Approved for servicing release

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants