Skip to content

Commit 47e24bb

Browse files
committed
Merge remote-tracking branch 'upstream/2.6' into sync-branch-2.6-to-main
2 parents 23ac75d + 8e61668 commit 47e24bb

16 files changed

Lines changed: 71 additions & 66 deletions

.github/workflows/build.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ jobs:
213213
artifact-windows-winarm: ${{ steps.prepare_deploy.outputs.artifact-windows-winarm }}
214214
steps:
215215
- name: "Check out repository"
216-
uses: actions/checkout@v6
216+
uses: actions/checkout@v7
217217
with:
218218
# This is necessary for making `git describe` work.
219219
fetch-depth: 0
@@ -339,7 +339,7 @@ jobs:
339339

340340
- name: "[Ubuntu/macOS] Set up GitHub cache for ccache"
341341
if: runner.os != 'windows'
342-
uses: actions/cache@v5
342+
uses: actions/cache@v6
343343
with:
344344
path: ${{ matrix.compiler_cache_path }}
345345
key: ${{ matrix.os }}-${{ matrix.compiler_cache_id }}-${{ inputs.branch }}-${{ github.run_number }}
@@ -691,7 +691,7 @@ jobs:
691691
rm -rf /host/usr/share/dotnet
692692
693693
- name: "Check out repository"
694-
uses: actions/checkout@v6
694+
uses: actions/checkout@v7
695695
with:
696696
fetch-depth: 0
697697

@@ -748,7 +748,7 @@ jobs:
748748
if: always() && github.repository == 'mixxxdj/mixxx'
749749
steps:
750750
- name: "Check out repository"
751-
uses: actions/checkout@v6
751+
uses: actions/checkout@v7
752752
with:
753753
fetch-depth: 0
754754

.github/workflows/changelog.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ permissions: {}
1212
jobs:
1313
trigger-changelog-update:
1414
name: Trigger Changelog update on manual repository
15-
runs-on: ubuntu-latest
15+
runs-on: ubuntu-slim
1616
steps:
1717
- name: Get current branch name
1818
uses: nelonoel/branch-name@v1.0.1

.github/workflows/checks.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: ${{ matrix.name }}
2525
steps:
2626
- name: Check out repository
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
- name: Add clazy PPA
2929
if: matrix.name == 'clazy'
3030
# Ubuntu2404 comes with v1.11, which is too old for the Qt6.4 shipped with Ubuntu 24.04

.github/workflows/develop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ permissions:
2121
jobs:
2222
stop-build:
2323
name: Check if build should be stopped
24-
runs-on: ubuntu-latest
24+
runs-on: ubuntu-slim
2525
outputs:
2626
result: ${{ github.event_name == 'push' && steps.stop-build.outputs.result || 'false' }}
2727
steps:
@@ -85,7 +85,7 @@ jobs:
8585
- checks
8686
- git
8787
- build
88-
runs-on: ubuntu-latest
88+
runs-on: ubuntu-slim
8989
steps:
9090
- name: Ready to go
9191
run: "exit 0"

.github/workflows/flatpak.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
jobs:
2121
publish-flatpak:
2222
name: Publish Flatpak
23-
runs-on: ubuntu-latest
23+
runs-on: ubuntu-slim
2424
steps:
2525
- name: "Set up SSH Agent"
2626
shell: bash
@@ -37,7 +37,7 @@ jobs:
3737
3838
- name: Check out repository
3939
if: ${{ inputs.update_repo }}
40-
uses: actions/checkout@v6
40+
uses: actions/checkout@v7
4141

4242
- name: "Prepare"
4343
id: prepare

.github/workflows/git.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ on:
55

66
jobs:
77
block-fixup:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-slim
99

1010
steps:
11-
- uses: actions/checkout@v6
11+
- uses: actions/checkout@v7
1212
- name: Block Fixup Commit Merge
13-
uses: 13rac1/block-fixup-merge-action@v2.0.0
13+
uses: acolombier/block-fixup-merge-action@master

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
permissions:
2020
contents: read # for actions/labeler to determine modified files
2121
pull-requests: write # for actions/labeler to add labels to PRs
22-
runs-on: ubuntu-latest
22+
runs-on: ubuntu-slim
2323

2424
steps:
2525
- uses: actions/labeler@v6.1.0

.github/workflows/pr-command.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
softfix:
88
name: Softfix action
99
if: github.event.issue.pull_request != '' && startsWith(github.event.comment.body, '/softfix')
10-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-slim
1111
steps:
1212
- name: Check if commenter is maintainer
1313
id: check-maintainer
@@ -24,7 +24,7 @@ jobs:
2424
return isMaintainer;
2525
- name: Checkout repository
2626
if: steps.check-maintainer.outputs.result == 'true'
27-
uses: actions/checkout@v6
27+
uses: actions/checkout@v7
2828
# Using an app is the recommended way to allow recursive operations.
2929
# Apps offer a way to have reduced scoped permissions (like GITHUB_TOKEN)
3030
# and short lifespan, unlike PAT.

.github/workflows/pre-commit.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,10 @@ permissions:
1515
jobs:
1616
pre-commit:
1717
name: Detecting code style issues
18-
runs-on: ubuntu-latest
19-
# The Dockerfile for this container can be found at:
20-
# https://github.com/Holzhaus/mixxx-ci-docker
21-
container: holzhaus/mixxx-ci:20220930
18+
runs-on: ubuntu-slim
2219
steps:
2320
- name: "Check out repository"
24-
uses: actions/checkout@v6
21+
uses: actions/checkout@v7
2522
with:
2623
# Unfortunately we need the whole history and can't use a shallow clone
2724
# because the Appstream Metadata hook parses the history to find the

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
permissions:
1414
issues: write # for actions/stale to close stale issues
1515
pull-requests: write # for actions/stale to close stale PRs
16-
runs-on: ubuntu-latest
16+
runs-on: ubuntu-slim
1717
steps:
1818
- uses: actions/stale@v10
1919
with:

0 commit comments

Comments
 (0)