Skip to content

Commit 5dd1958

Browse files
committed
Fix workflow triggers and macOS matrix
1 parent d159856 commit 5dd1958

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed

.github/workflows/macos-build.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: macOS Build
22

33
on:
44
push:
5-
branches: [ "master", "better_workflow" ]
5+
branches: [ "master" ]
66
pull_request:
7-
branches: [ "master", "better_workflow" ]
7+
branches: [ "master" ]
88

99
permissions:
1010
contents: read
@@ -135,6 +135,13 @@ jobs:
135135
ffmpeg: no-ffmpeg
136136
page-size: 4kb
137137
run-on: master-only
138+
- os: macos-latest
139+
os-name: macOS
140+
ndk: r27c
141+
build-system: ndk-build
142+
ffmpeg: no-ffmpeg
143+
page-size: 4kb
144+
run-on: master-only
138145

139146
# Skip master-only jobs when not on master branch
140147
if: matrix.run-on == 'always' || github.ref == 'refs/heads/master'

.github/workflows/ubuntu-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Ubuntu Build
22

33
on:
44
push:
5-
branches: [ "master", "better_workflow" ]
5+
branches: [ "master" ]
66
pull_request:
7-
branches: [ "master", "better_workflow" ]
7+
branches: [ "master" ]
88

99
permissions:
1010
contents: read
@@ -229,7 +229,7 @@ jobs:
229229
lint:
230230
name: Lint
231231
runs-on: ubuntu-latest
232-
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master' || github.ref == 'refs/heads/better_workflow'
232+
if: github.event_name == 'pull_request' || github.ref == 'refs/heads/master'
233233

234234
steps:
235235
- name: Checkout code

.github/workflows/windows-build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Windows Build
22

33
on:
44
push:
5-
branches: [ "master", "better_workflow" ]
5+
branches: [ "master" ]
66
pull_request:
7-
branches: [ "master", "better_workflow" ]
7+
branches: [ "master" ]
88

99
permissions:
1010
contents: read
@@ -152,7 +152,7 @@ jobs:
152152
add-to-path: true
153153

154154
- name: Install build tools
155-
run: choco install ninja
155+
run: choco install ninja -y
156156

157157
- name: Setup JDK 17
158158
uses: actions/setup-java@v3

0 commit comments

Comments
 (0)