DOCGroup / ACE_TAO

ACE and TAO
https://www.dre.vanderbilt.edu/~schmidt/TAO.html
698 stars 374 forks source link

Upgrade to run-vcpkg v10 (backport #1888) #2176

Closed mergify[bot] closed 9 months ago

mergify[bot] commented 9 months ago

This is an automatic backport of pull request #1888 done by Mergify. Cherry-pick of 00b5590e8f1c6403a4af096e96fc321e3fe7f4e7 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 1 commit.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 00b5590e8f1.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 9c95a92d0cc7aeea3d9dd37318544638600ef1b0 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 8 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 9c95a92d0cc.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of d3ae481ff4c44389620d8ac242d75a6bf3e98034 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 9 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit d3ae481ff4c.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of cbedceeb2e8d88622fbbf9699a68fb0adaef1576 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 12 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit cbedceeb2e8.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 52f7f73a6956b157f482e3fa29e173892ff88478 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 13 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 52f7f73a695.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 02dd01dfbad6078cfdb622c32a94e635448fe983 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 14 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 02dd01dfbad.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of e2a73f709b263c35c0b0a0817ef71fcc73a78a55 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 15 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit e2a73f709b2.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of eb6c324131f7496d1a0978a4c3ec96d4312c5e1a has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 16 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit eb6c324131f.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

Cherry-pick of 7ff6fc7440e01f148f7b14d957865c0d6ca3ba88 has failed:

On branch mergify/bp/ace6tao2/pr-1888
Your branch is ahead of 'origin/ace6tao2' by 17 commits.
  (use "git push" to publish your local commits)

You are currently cherry-picking commit 7ff6fc7440e.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   .github/workflows/windows.yml

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options
More conditions and actions can be found in the [documentation](https://docs.mergify.com/). You can also trigger Mergify actions by commenting on this pull request: - `@Mergifyio refresh` will re-evaluate the rules - `@Mergifyio rebase` will rebase this PR on its base branch - `@Mergifyio update` will merge the base branch into this PR - `@Mergifyio backport ` will backport this PR on `` branch Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you can: - look at your merge queues - generate the Mergify configuration with the config editor. Finally, you can contact us on https://mergify.com