-
Notifications
You must be signed in to change notification settings - Fork 440
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(windows): revert to old workflow and vcxproj
- Loading branch information
1 parent
4db3260
commit 9bad5a6
Showing
2 changed files
with
33 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,6 +3,7 @@ name: Build CCExtractor on Windows | |
env: | ||
RUSTFLAGS: -Ctarget-feature=+crt-static | ||
VCPKG_DEFAULT_TRIPLET: x64-windows-static | ||
VCPKG_DEFAULT_BINARY_CACHE: C:\vcpkg\.cache | ||
|
||
on: | ||
workflow_dispatch: | ||
|
@@ -22,36 +23,40 @@ on: | |
|
||
jobs: | ||
build_release: | ||
runs-on: windows-2019 | ||
runs-on: windows-2022 | ||
steps: | ||
- name: Check out repository | ||
uses: actions/checkout@v4 | ||
- name: Setup MSBuild.exe | ||
uses: microsoft/[email protected] | ||
with: | ||
msbuild-architecture: x64 | ||
- name: Install llvm and clang | ||
run: choco install llvm gpac | ||
- name: Setup vcpkg | ||
run: mkdir C:\vcpkg\.cache | ||
- name: Cache vcpkg | ||
id: cache | ||
uses: actions/cache@v3 | ||
with: | ||
path: | | ||
C:\vcpkg\.cache | ||
key: vcpkg-${{ runner.os }} | ||
- name: Install dependencies | ||
run: vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static | ||
- uses: actions-rs/toolchain@v1 | ||
with: | ||
toolchain: stable | ||
override: true | ||
- name: Install Win 10 SDK | ||
uses: ilammy/msvc-dev-cmd@v1 | ||
- name: Setup Vcpkg | ||
id: vcpkg | ||
uses: friendlyanon/setup-vcpkg@v1 | ||
with: | ||
committish: "2023.08.09" | ||
cache-version: "3" | ||
ignore-reserve-cache-error: true | ||
- name: Install dependencies | ||
run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static | ||
- name: build Release-Full | ||
env: | ||
LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib" | ||
LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config" | ||
CARGO_TARGET_DIR: "..\\..\\windows" | ||
BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0 | ||
VCPKG_ROOT: ${{ github.workspace }}\vcpkg | ||
VCPKG_ROOT: C:\vcpkg | ||
run: msbuild ccextractor.sln /p:Configuration=Release-Full /p:Platform=x64 | ||
working-directory: ./windows | ||
- name: Display version information | ||
|
@@ -64,23 +69,27 @@ jobs: | |
./windows/x64/Release-Full/ccextractorwinfull.exe | ||
./windows/x64/Release-Full/*.dll | ||
build_debug: | ||
runs-on: windows-2019 | ||
runs-on: windows-2022 | ||
steps: | ||
- name: Check out repository | ||
uses: actions/checkout@v4 | ||
- name: Setup MSBuild.exe | ||
uses: microsoft/[email protected] | ||
with: | ||
msbuild-architecture: x64 | ||
- name: Install llvm and clang | ||
run: choco install llvm gpac | ||
- name: Setup Vcpkg | ||
id: vcpkg | ||
uses: friendlyanon/setup-vcpkg@v1 | ||
- name: Setup vcpkg | ||
run: mkdir C:\vcpkg\.cache | ||
- name: Cache vcpkg | ||
id: cache | ||
uses: actions/cache@v3 | ||
with: | ||
committish: "2023.08.09" | ||
cache-version: "3" | ||
ignore-reserve-cache-error: true | ||
path: | | ||
C:\vcpkg\.cache | ||
key: vcpkg-${{ runner.os }} | ||
- name: Install dependencies | ||
run: cd vcpkg && vcpkg integrate install && vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static | ||
run: vcpkg install leptonica tesseract ffmpeg --triplet x64-windows-static | ||
- uses: actions-rs/toolchain@v1 | ||
with: | ||
toolchain: stable | ||
|
@@ -93,7 +102,7 @@ jobs: | |
LLVM_CONFIG_PATH: "C:\\Program Files\\LLVM\\bin\\llvm-config" | ||
CARGO_TARGET_DIR: "..\\..\\windows" | ||
BINDGEN_EXTRA_CLANG_ARGS: -fmsc-version=0 | ||
VCPKG_ROOT: ${{ github.workspace }}\vcpkg | ||
VCPKG_ROOT: C:\vcpkg | ||
run: msbuild ccextractor.sln /p:Configuration=Debug-Full /p:Platform=x64 | ||
working-directory: ./windows | ||
- name: Display version information | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters