Skip to content

Commit 44ea5f0

Browse files
committed
Split st and mt core build cache
1 parent 5031606 commit 44ea5f0

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

Diff for: .github/workflows/CI.yml

+7-3
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,16 @@ jobs:
2121
id: cache-build
2222
uses: actions/cache@v3
2323
with:
24-
path: build-cache
25-
key: build-cache-v1-${{ hashFiles('Dockerfile', 'build/*') }}
24+
path: |
25+
build-cache-st
26+
build-cache-mt
27+
key: build-cache-v1-${{ hashFiles('Dockerfile', 'Makefile', 'build/*') }}
2628
restore-keys: |
2729
build-cache-v1-
2830
- name: Build ffmpeg-core
29-
run: make ci ci-mt
31+
run: make prd EXTRA_ARGS="--cache-from=type=local,src=build-cache-st --cache-to=type=local,dest=build-cache-st,mode=max"
32+
- name: Build ffmpet-core-mt
33+
run: make prd-mt EXTRA_ARGS="--cache-from=type=local,src=build-cache-mt --cache-to=type=local,dest=build-cache-mt,mode=max"
3034
- name: Upload core and core-mt
3135
uses: actions/upload-artifact@v3
3236
with:

Diff for: Makefile

-7
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ all: dev
33
MT_FLAGS := -sUSE_PTHREADS -pthread
44

55
DEV_ARGS := --progress=plain
6-
CI_ARGS := --cache-from=type=local,src=build-cache --cache-to=type=local,dest=build-cache,mode=max
76

87
DEV_CFLAGS := --profiling
98
DEV_MT_CFLAGS := $(DEV_CFLAGS) $(MT_FLAGS)
@@ -49,9 +48,3 @@ prd:
4948

5049
prd-mt:
5150
make build-mt EXTRA_CFLAGS="$(PROD_MT_CFLAGS)"
52-
53-
ci:
54-
make prd EXTRA_ARGS="$(CI_ARGS)"
55-
56-
ci-mt:
57-
make prd-mt EXTRA_ARGS="$(CI_ARGS)"

0 commit comments

Comments
 (0)