Skip to content

Merge changes from 2.5 into 2.6#15095

Merged
acolombier merged 3 commits into
2.6from
sync-branch-2.5-to-2.6
Jul 21, 2025
Merged

Merge changes from 2.5 into 2.6#15095
acolombier merged 3 commits into
2.6from
sync-branch-2.5-to-2.6

Conversation

@mixxxbot
Copy link
Copy Markdown
Collaborator

New content has landed in the 2.5 branch, so let's merge the changes into 2.6

dependabot Bot and others added 3 commits July 14, 2025 21:40
Bumps [azure/trusted-signing-action](https://github.com/azure/trusted-signing-action) from 0.5.1 to 0.5.9.
- [Release notes](https://github.com/azure/trusted-signing-action/releases)
- [Commits](Azure/artifact-signing-action@v0.5.1...v0.5.9)

---
updated-dependencies:
- dependency-name: azure/trusted-signing-action
  dependency-version: 0.5.9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
…azure/trusted-signing-action-0.5.9

Bump azure/trusted-signing-action from 0.5.1 to 0.5.9
@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jul 16, 2025

CI passes but for some reason precommit can't reach https://github.com/mixxxdj/mixxx/issues/

Run appstreamcli validate res/linux/org.mixxx.Mixxx.metainfo.xml
  appstreamcli validate res/linux/org.mixxx.Mixxx.metainfo.xml
  shell: sh -e {0}
W: org.mixxx.Mixxx:89: url-not-reachable
     https://github.com/mixxxdj/mixxx/issues/ - Unexpected status code: 503

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jul 16, 2025

Besides that, is there anything else we need to pay attention to when merging CI updates?
(not familiar with that, do we freeze some runner/hook versions or something?)

@daschuer
Copy link
Copy Markdown
Member

Besides that, is there anything else we need to pay attention to when merging CI updates?

In the past I did a short smoke test at least when merging manual. I think we should still do it in case of bigger functional changes. In this case we have no functional change to test.

This CI failure is Code 503 "Service Unavailable"
Probably only a temporary issue. I try to restart

@ronso0
Copy link
Copy Markdown
Member

ronso0 commented Jul 16, 2025

Probably only a temporary issue. I try to restart

Yeah, I already restarted that, still 503
And yes, that's not blocking.

@acolombier acolombier merged commit d619369 into 2.6 Jul 21, 2025
45 of 48 checks passed
@acolombier acolombier deleted the sync-branch-2.5-to-2.6 branch July 21, 2025 20:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants