Skip to content

Commit 64fc39e

Browse files
committed
Merge branch 'master' into spiced
2 parents 921201b + affd4ea commit 64fc39e

4 files changed

Lines changed: 17 additions & 6 deletions

File tree

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ CMAKE_GENERATOR="Ninja"
88
MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion 2>/dev/null || echo "15.4")"
99

1010
CMAKE_POLICY_VERSION_MINIMUM="4.1"
11-
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.0}"
11+
MACOSX_DEPLOYMENT_TARGET="${MACOSX_DEPLOYMENT_TARGET:-26.1}"
1212
CFLAGS="-mcpu=native"
1313
CXXFLAGS="${CFLAGS}"

.github/workflows/build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626

2727
- name: Select Xcode
2828
run: |
29-
sudo xcode-select -s /Applications/Xcode_26.0.app
29+
sudo xcode-select -s /Applications/Xcode_26.1.app
3030
xcodebuild -version
3131
3232
- name: Create Stow Directory
@@ -38,7 +38,6 @@ jobs:
3838
- name: Install Dependencies
3939
run: |
4040
brew update -q
41-
brew uninstall -q cmake
4241
xargs brew install -q --formula < homebrew/build-deps.txt
4342
4443
- name: Fetch Sources
@@ -47,11 +46,11 @@ jobs:
4746
- name: Build & Install
4847
run: ./build-all --bundle
4948
env:
50-
MACOSX_DEPLOYMENT_TARGET: 26.0
49+
MACOSX_DEPLOYMENT_TARGET: 26.1
5150

5251
- name: Upload Artifact
5352
id: upload
54-
uses: actions/upload-artifact@v4
53+
uses: actions/upload-artifact@v5
5554
with:
5655
name: mpv-macos-26-arm64
5756
path: mpv.tar.gz

.github/workflows/lint.yml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,22 @@ on:
88
jobs:
99
shellcheck:
1010
runs-on: ubuntu-latest
11+
permissions:
12+
security-events: write
13+
contents: read
1114
steps:
1215
- name: Checkout
1316
uses: actions/checkout@v5
1417

18+
- name: Create requirements.txt
19+
if: hashFiles('**/requirements.txt', '**/pyproject.toml') == ''
20+
run: touch ./requirements.txt
21+
1522
- name: Check
16-
run: shellcheck .env build-* fetch
23+
uses: reactive-firewall/shellcheck-scan@v1
24+
with:
25+
match: .env build-* fetch
26+
publish-artifacts: ${{ github.ref_name == github.event.repository.default_branch }}
1727

1828
yamllint:
1929
runs-on: ubuntu-latest

.yamllint.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@ extends: default
33

44
rules:
55
truthy: disable
6+
line-length:
7+
max: 100
68
comments:
79
min-spaces-from-content: 1

0 commit comments

Comments
 (0)