One Repo To Rule Them All #4058

ricab · 2025-04-24T10:13:02Z

No description provided.

…fix-symlink-mounting

Fix symlink resolution when mounting

[windows] filter out "ci" from msi package version string

[windows] Force stop daemon

… the private constructor pattern.

…vent unexpected throw.

Clone polishing

Fix conflict by moving the check for the VirtualBox backend to compile time too.

Private side of clone of #3740: "Fix multipass_tests target on Ubuntu ARM64 (#3739)"

Update lukka/get-cmake action to v3.31.0

[ci] macos-12 is deprecated, so update to 13 for combining packages

[ci] try to get windows adk with winget

…k-whitespace

Update LICENCE.TXT and LICENCE.rtf. The latter gets incorporated in the MSI package. It was regenerated with: ``` pandoc --template=template.rtf -s LICENCE.txt -o LICENCE.rtf ```

[cmake] Abbreviate hash with 8 chars for version

Update licenses in Windows and macOS packages

ricab · 2025-05-05T20:13:37Z

Alright, this is ready for review. A few points:

The expected macOS and Windows checks are not relevant here: they correspond to the old triggers onto the private repo. New macOS/Windows jobs are run directly here.
The CLA check is complaining on commits that were already on full. It doesn't make sense to attempt editing commits from years ago which were already accepted IMO. I have fixed the authorship of any new commits (unless something escaped me).
Coverage in full wasn't tracked and it's no surprise that it was lower. A total -0.06% change isn't bad overall, I think.

src/platform/platform_proprietary.cpp

georgeliao · 2025-05-07T17:15:14Z

@ricab
I have browsed through all the diff between public/merger and private/full, things look good to me. I also did smoke test on all three platforms, everything works fine.

ricab · 2025-05-07T18:07:47Z

Thanks @georgeliao.

How about you @sharder996? Does this have your stamp of approval?

sharder996 · 2025-05-07T19:05:16Z

@ricab Yup, +1 from me!

ricab · 2025-05-07T19:10:27Z

Muhahaha

ricab · 2025-05-08T12:55:49Z

Alright, this isn't going to merge because it keeps waiting for the old checks. I have dropped the commit to skip doc checks, since that is now in through #4076. @sharder996 or @georgeliao, could one of you please give this a green checkmark? Then I'll merge manually.

ricab · 2025-05-08T13:00:53Z

townsend2010 · 2025-05-13T15:19:52Z

Just noticed this was merged. What a miraculous day!!!!

Sploder12 and others added 30 commits November 27, 2024 09:26

Merge remote-tracking branch 'public/fix-symlink-mounting' into base-…

e90ac8b

…fix-symlink-mounting

[smb] Fix failing tests

6abe129

[cpack] filter out "ci" from version string

320fceb

Merge pull request #691 from canonical/fix-symlink-mounting

8a5fb2e

Fix symlink resolution when mounting

Merge pull request #693 from canonical/filter-msi-version-str

4b0c616

[windows] filter out "ci" from msi package version string

Merge pull request #692 from canonical/force-stop-daemon

ca40567

[windows] Force stop daemon

[hyperv][unit test] fixed the failed unit tests which was incurred by…

9ec3292

… the private constructor pattern.

Merge remote-tracking branch 'public/main' into full

3300e7e

[hyperv] applied the top_catch_all wrapper to hyper destructor to pre…

b2d34a1

…vent unexpected throw.

[virtualbox] apply the top_catch_all to the virtualbox destructor.

7ec4d3b

[hyperv][virtualbox] changed the category to vm_name

d9d37b0

Merge pull request #676 from canonical/clone_polishing

90a6c8e

Clone polishing

Merge remote-tracking branch 'public/main' into full

1b90519

Merge remote-tracking branch 'public/main' into full

cf6073a

Update lukka/get-cmake action to v3.31.0

51bc5cb

Merge remote-tracking branch 'public/issues/3739' into base-issues-3739

ef79d42

Fix conflict by moving the check for the VirtualBox backend to compile time too.

[osx] Move backend checks to compile time

1d5e0b7

Merge remote-tracking branch 'public/main' into full

31a8647

Merge pull request #695 from /issues/3739

62dab4b

Private side of clone of #3740: "Fix multipass_tests target on Ubuntu ARM64 (#3739)"

Merge remote-tracking branch 'public/main' into full

1341afc

Merge remote-tracking branch 'public/main' into full

09c2c3d

Merge pull request #667 from canonical/renovate/lukka-get-cmake-3.x

e0f4231

Update lukka/get-cmake action to v3.31.0

[ci] macos-12 is deprecated, so update to 13 for combining packages

cfac6a4

[macOS] Require macOS 13 as minimum version

a1b501f

Merge pull request #697 from canonical/publish-on-macos-13

7d72289

[ci] macos-12 is deprecated, so update to 13 for combining packages

[ci] try to get windows adk with winget

ff9f7c1

Merge pull request #698 from canonical/wiget-windows-adk

a933e88

[ci] try to get windows adk with winget

Merge remote-tracking branch 'public/check-whitespace' into base-chec…

19b2158

…k-whitespace

[format] Fix missing newline in rtf file

94964b4

[ci] Generalize action name

f9542c2

ricab added 5 commits May 5, 2025 16:17

[licence] Update mac package with GPL-3.0

486f087

[licence] Update win package with GPL-3.0

8113570

Update LICENCE.TXT and LICENCE.rtf. The latter gets incorporated in the MSI package. It was regenerated with: ``` pandoc --template=template.rtf -s LICENCE.txt -o LICENCE.rtf ```

[licence] Reduce font of windows licence file

a49186d

Merge pull request #751 from canonical/limit-version-size

35569cc

[cmake] Abbreviate hash with 8 chars for version

Merge pull request #750 from canonical/open-source

2f30447

Update licenses in Windows and macOS packages

ricab force-pushed the merger branch from c18cac3 to 2f30447 Compare May 5, 2025 15:19

ricab marked this pull request as ready for review May 5, 2025 20:04

georgeliao self-requested a review May 6, 2025 13:03

sharder996 reviewed May 6, 2025

View reviewed changes

src/platform/platform_proprietary.cpp Show resolved Hide resolved

ricab force-pushed the merger branch from 6cb7579 to b9bb6df Compare May 6, 2025 16:52

georgeliao previously approved these changes May 7, 2025

View reviewed changes

sharder996 previously approved these changes May 7, 2025

View reviewed changes

ricab enabled auto-merge May 7, 2025 19:10

[platform] Add doc for platform_proprietary.cpp

b49e021

ricab dismissed stale reviews from sharder996 and georgeliao via b49e021 May 8, 2025 12:52

ricab force-pushed the merger branch from b9bb6df to b49e021 Compare May 8, 2025 12:52

georgeliao approved these changes May 8, 2025

View reviewed changes

ricab disabled auto-merge May 8, 2025 12:59

ricab merged commit b086fb7 into main May 8, 2025
14 of 15 checks passed

ricab deleted the merger branch May 8, 2025 13:00

ricab added this to the 1.16.0 milestone Jun 13, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

One Repo To Rule Them All #4058

One Repo To Rule Them All #4058

Uh oh!

ricab commented Apr 24, 2025

Uh oh!

ricab commented May 5, 2025

Uh oh!

Uh oh!

georgeliao commented May 7, 2025

Uh oh!

ricab commented May 7, 2025

Uh oh!

sharder996 commented May 7, 2025

Uh oh!

ricab commented May 7, 2025 •

edited

Loading

Uh oh!

ricab commented May 8, 2025

Uh oh!

Uh oh!

ricab commented May 8, 2025

Uh oh!

townsend2010 commented May 13, 2025

Uh oh!

Uh oh!

One Repo To Rule Them All #4058

One Repo To Rule Them All #4058

Uh oh!

Conversation

ricab commented Apr 24, 2025

Uh oh!

ricab commented May 5, 2025

Uh oh!

Uh oh!

georgeliao commented May 7, 2025

Uh oh!

ricab commented May 7, 2025

Uh oh!

sharder996 commented May 7, 2025

Uh oh!

ricab commented May 7, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ricab commented May 8, 2025

Uh oh!

Uh oh!

ricab commented May 8, 2025

Uh oh!

townsend2010 commented May 13, 2025

Uh oh!

Uh oh!

ricab commented May 7, 2025 •

edited

Loading