Skip to content

Commit 2dc5cf3

Browse files
cfsmp3claude
andauthored
Improve CI caching, fix Linux deps, fix WinGet fork-user
* Improve CI caching and fix Linux build dependencies - release.yml: Replace manual vcpkg clone + binary cache with lukka/run-vcpkg@v11 and installed-packages caching (matching build_windows.yml), add Cargo registry caching - build_linux.yml: Add FFmpeg dev packages to build_autoconf, cmake, and build_rust jobs — libgpac on newer Ubuntu requires FFmpeg 6.x libraries at link time Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * Fix WinGet publish: add fork-user to point to CCExtractor org fork The winget-releaser action defaults to creating branches on the token owner's fork (cfsmp3/winget-pkgs), which doesn't exist. The actual fork is at CCExtractor/winget-pkgs. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 185631d commit 2dc5cf3

3 files changed

Lines changed: 34 additions & 15 deletions

File tree

.github/workflows/build_linux.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-latest
5454
steps:
5555
- name: Install dependencies
56-
run: sudo apt update && sudo apt-get install libgpac-dev
56+
run: sudo apt update && sudo apt-get install libgpac-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
5757
- uses: actions/checkout@v6
5858
- name: run autogen
5959
run: ./autogen.sh
@@ -71,7 +71,7 @@ jobs:
7171
runs-on: ubuntu-latest
7272
steps:
7373
- name: Install dependencies
74-
run: sudo apt update && sudo apt-get install libgpac-dev
74+
run: sudo apt update && sudo apt-get install libgpac-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
7575
- uses: actions/checkout@v6
7676
- name: cmake
7777
run: mkdir build && cd build && cmake ../src
@@ -100,7 +100,7 @@ jobs:
100100
runs-on: ubuntu-latest
101101
steps:
102102
- name: Install dependencies
103-
run: sudo apt update && sudo apt-get install libgpac-dev
103+
run: sudo apt update && sudo apt-get install libgpac-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
104104
- uses: actions/checkout@v6
105105
- name: cache
106106
uses: actions/cache@v5

.github/workflows/publish_winget.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# - PR to: https://github.com/microsoft/winget-pkgs
77
#
88
# 2. Create a fork of microsoft/winget-pkgs under the CCExtractor organization
9-
# - https://github.com/CCExtractor/winget-pkgs (needs to be created)
9+
# - https://github.com/CCExtractor/winget-pkgs
1010
#
1111
# 3. Create a GitHub Personal Access Token (classic) with 'public_repo' scope
1212
# - Add as repository secret: WINGET_TOKEN
@@ -39,4 +39,5 @@ jobs:
3939
identifier: CCExtractor.CCExtractor
4040
installers-regex: '\.msi$' # Only use the MSI installer
4141
token: ${{ secrets.WINGET_TOKEN }}
42+
fork-user: CCExtractor
4243
release-tag: ${{ github.event.inputs.release_tag || github.event.workflow_run.head_branch }}

.github/workflows/release.yml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ permissions:
1010

1111
env:
1212
RUSTFLAGS: -Ctarget-feature=+crt-static
13-
VCPKG_DEFAULT_BINARY_CACHE: C:\vcpkg\.cache
1413
VCPKG_COMMIT: ab2977be50c702126336e5088f4836060733c899
1514

1615
jobs:
@@ -66,26 +65,45 @@ jobs:
6665
msbuild-architecture: x64
6766
- name: Install gpac
6867
run: choco install gpac --version 2.4.0 ${{ matrix.arch == 'x86' && '--forcex86' || '' }}
68+
# Use lukka/run-vcpkg for better caching
6969
- name: Setup vcpkg
70-
run: mkdir C:\vcpkg\.cache
71-
- name: Cache vcpkg
72-
id: cache
70+
uses: lukka/run-vcpkg@v11
71+
id: runvcpkg
72+
with:
73+
vcpkgGitCommitId: ${{ env.VCPKG_COMMIT }}
74+
vcpkgDirectory: ${{ github.workspace }}/vcpkg
75+
vcpkgJsonGlob: 'windows/vcpkg.json'
76+
77+
# Cache vcpkg installed packages separately for faster restores
78+
- name: Cache vcpkg installed packages
79+
id: vcpkg-installed-cache
7380
uses: actions/cache@v5
7481
with:
75-
path: |
76-
C:\vcpkg\.cache
77-
key: vcpkg-${{ runner.os }}-${{ matrix.vcpkg_triplet }}-${{ env.VCPKG_COMMIT }}
78-
- name: Build vcpkg
79-
run: |
80-
git clone https://github.com/microsoft/vcpkg
81-
./vcpkg/bootstrap-vcpkg.bat
82+
path: ${{ github.workspace }}/vcpkg/installed
83+
key: vcpkg-installed-${{ runner.os }}-${{ matrix.vcpkg_triplet }}-${{ env.VCPKG_COMMIT }}-${{ hashFiles('windows/vcpkg.json') }}
84+
restore-keys: |
85+
vcpkg-installed-${{ runner.os }}-${{ matrix.vcpkg_triplet }}-${{ env.VCPKG_COMMIT }}-
86+
8287
- name: Install dependencies
88+
if: steps.vcpkg-installed-cache.outputs.cache-hit != 'true'
8389
run: ${{ github.workspace }}/vcpkg/vcpkg.exe install --triplet ${{ matrix.vcpkg_triplet }} --x-install-root ${{ github.workspace }}/vcpkg/installed/
8490
working-directory: windows
8591
- name: Setup Rust toolchain
8692
uses: dtolnay/rust-toolchain@stable
8793
with:
8894
targets: ${{ matrix.rust_target }}
95+
96+
# Cache Cargo registry
97+
- name: Cache Cargo registry
98+
uses: actions/cache@v5
99+
with:
100+
path: |
101+
~/.cargo/registry
102+
~/.cargo/git
103+
key: ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
104+
restore-keys: |
105+
${{ runner.os }}-cargo-registry-
106+
89107
- name: Install Win 10 SDK
90108
uses: ilammy/msvc-dev-cmd@v1
91109
with:

0 commit comments

Comments
 (0)