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

Merge main into release-1.12 #6249

Merged
merged 6 commits into from
Dec 21, 2023
Merged

Merge main into release-1.12 #6249

merged 6 commits into from
Dec 21, 2023

Conversation

jandubois
Copy link
Member

Mostly to cherry-pick #6242.

dependabot bot and others added 6 commits December 13, 2023 09:15
Bumps [github.com/google/uuid](https://github.com/google/uuid) from 1.4.0 to 1.5.0.
- [Release notes](https://github.com/google/uuid/releases)
- [Changelog](https://github.com/google/uuid/blob/master/CHANGELOG.md)
- [Commits](google/uuid@v1.4.0...v1.5.0)

---
updated-dependencies:
- dependency-name: github.com/google/uuid
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Signed-off-by: Adam Pickering <adam.pickering@suse.com>
…rc/go/vtunnel/github.com/google/uuid-1.5.0

Bump github.com/google/uuid from 1.4.0 to 1.5.0 in /src/go/vtunnel
Add "Using the Open Build Service" AppImage documentation link to OBS tips documentation
Fedora 39 uses a version of libcairo that is newer than other distros.
This newer version appears to have removed a symbol that is required
for Rancher Desktop. The fix is to bundle the older version of
libcairo inside the AppImage (which is the only package format that
has this problem occurs as of the time of writing).

Signed-off-by: Adam Pickering <adam.pickering@suse.com>
@jandubois jandubois merged commit eb59b55 into release-1.12 Dec 21, 2023
28 checks passed
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.

5 participants