Skip to content

Commit f93b8bb

Browse files
committed
Fix build
1 parent 600f1d8 commit f93b8bb

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

.github/workflows/CI.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ name: CI
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77
pull_request:
8-
branches:
9-
- main
8+
branches:
9+
- master
1010

1111
jobs:
1212
build-core:
@@ -21,7 +21,7 @@ jobs:
2121
uses: docker/setup-buildx-action@v2
2222
- name: Cache build
2323
id: cache-build
24-
uses: actions/cache@v2
24+
uses: actions/cache@v4
2525
with:
2626
path: build-cache-st
2727
key: build-cache-st-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
@@ -30,7 +30,7 @@ jobs:
3030
- name: Build ffmpeg-core
3131
run: make prd EXTRA_ARGS="--cache-from=type=local,src=build-cache-st --cache-to=type=local,dest=build-cache-st,mode=max"
3232
- name: Upload core
33-
uses: actions/upload-artifact@v2
33+
uses: actions/upload-artifact@v4
3434
with:
3535
name: ffmpeg-core
3636
path: packages/core/dist/*
@@ -44,7 +44,7 @@ jobs:
4444
uses: docker/setup-buildx-action@v2
4545
- name: Cache build
4646
id: cache-build
47-
uses: actions/cache@v2
47+
uses: actions/cache@v4
4848
with:
4949
path: build-cache-mt
5050
key: build-cache-mt-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
@@ -53,7 +53,7 @@ jobs:
5353
- name: Build ffmpet-core-mt
5454
run: make prd-mt EXTRA_ARGS="--cache-from=type=local,src=build-cache-mt --cache-to=type=local,dest=build-cache-mt,mode=max"
5555
- name: Upload core-mt
56-
uses: actions/upload-artifact@v2
56+
uses: actions/upload-artifact@v4
5757
with:
5858
name: ffmpeg-core-mt
5959
path: packages/core-mt/dist/*
@@ -66,12 +66,12 @@ jobs:
6666
- name: Checkout Source Code
6767
uses: actions/checkout@v2
6868
- name: Download ffmpeg-core
69-
uses: actions/download-artifact@v2
69+
uses: actions/download-artifact@v4
7070
with:
7171
name: ffmpeg-core
7272
path: packages/core/dist
7373
- name: Download ffmpeg-core-mt
74-
uses: actions/download-artifact@v2
74+
uses: actions/download-artifact@v4
7575
with:
7676
name: ffmpeg-core-mt
7777
path: packages/core-mt/dist
@@ -81,7 +81,7 @@ jobs:
8181
node-version: 18.x
8282
- name: Cache dependencies
8383
id: cache-dependencies
84-
uses: actions/cache@v2
84+
uses: actions/cache@v4
8585
with:
8686
path: node_modules
8787
key: node-modules-${{ hashFiles('package-lock.json') }}
@@ -90,4 +90,4 @@ jobs:
9090
- name: Install dependencies
9191
run: npm install
9292
- name: Run tests
93-
run: npm test
93+
run: npm test

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"serve": "http-server -c-1 -s -p 3000 .",
1111
"test": "server-test test:browser:server 3000 test:all",
1212
"test:all": "npm-run-all test:browser:*:*",
13-
"test:browser": "mocha-headless-chrome -a enable-features=SharedArrayBuffer",
13+
"test:browser": "mocha-headless-chrome -a enable-features=SharedArrayBuffer -a no-sandbox",
1414
"test:browser:core:mt": "npm run test:browser -- -f http://localhost:3000/tests/ffmpeg-core-mt.test.html",
1515
"test:browser:core:st": "npm run test:browser -- -f http://localhost:3000/tests/ffmpeg-core-st.test.html",
1616
"test:browser:ffmpeg:mt": "npm run test:browser -- -f http://localhost:3000/tests/ffmpeg-mt.test.html",

0 commit comments

Comments
 (0)