Code

Merge eng/ from main on assets push#8020

Code

Merged

scbedd merged 13 commits intomainAzure/azure-sdk-tools:mainfrom feature/merge-main-on-pushAzure/azure-sdk-tools:feature/merge-main-on-pushCopy head branch name to clipboardApr 6, 2024

+54-13

Commits

Commits on Apr 3, 2024

• ensure we fetch and merge main before pushing a new tag

  scbedd

  committed
  8947a5e

  Copy full SHA for 8947a5e

• what the heck does fetch merge mean

  scbedd

  committed
  2ad1169

  Copy full SHA for 2ad1169

• move the merge _after_ the commit

  scbedd

  committed
  6b565bb

  Copy full SHA for 6b565bb

• ensure that the integration merge also has the correct config settings

  scbedd

  committed
  d6f3638

  Copy full SHA for d6f3638

• get rid of 'merge' methodology that was pulling in changes that we DID NOT want to deal with

  scbedd

  committed
  8a774fa

  Copy full SHA for 8a774fa

• restore the launch settings

  scbedd

  committed
  833c57d

  Copy full SHA for 833c57d

Commits on Apr 4, 2024

• remove inapplicable comment

  scbedd

  committed
  9c36546

  Copy full SHA for 9c36546

• handle when the patch is no-op

  scbedd

  committed
  067b5ae

  Copy full SHA for 067b5ae

• grab gitignore

  scbedd

  committed
  76e435c

  Copy full SHA for 76e435c

• Merge remote-tracking branch 'upstream/main' into feature/merge-main-on-push

  scbedd

  committed
  ba378db

  Copy full SHA for ba378db

• repair the tests

  scbedd

  committed
  f46774c

  Copy full SHA for f46774c

Commits on Apr 5, 2024

• ensure that the root file properly applies

  scbedd

  committed
  7cfcc91

  Copy full SHA for 7cfcc91

• reset --soft was firing when we were unable to retrieve main properly. definitely don't want that to be the case

  scbedd

  committed
  8ce22ac

  Copy full SHA for 8ce22ac