Skip to content

Commit 81c32d9

Browse files
committed
fix: bump rust version to 1.57.0 and build vcpkg for window hardsubx builds
1 parent 5389380 commit 81c32d9

File tree

2 files changed

+19
-5
lines changed

2 files changed

+19
-5
lines changed

.github/workflows/build_linux.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build CCExtractor on Linux
22

33
on:
4+
workflow_dispatch:
45
push:
56
paths:
67
- '.github/workflows/build_linux.yml'
@@ -96,7 +97,7 @@ jobs:
9697
restore-keys: ${{ runner.os }}-cargo-
9798
- uses: actions-rs/toolchain@v1
9899
with:
99-
toolchain: 1.56.0
100+
toolchain: 1.57.0
100101
override: true
101102
- name: build
102103
run: cargo build

.github/workflows/build_windows.yml

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
name: Build CCExtractor on Windows
22

33
on:
4+
workflow_dispatch:
45
push:
56
paths:
67
- ".github/workflows/build_windows.yml"
@@ -27,7 +28,7 @@ jobs:
2728
run: choco install llvm
2829
- uses: actions-rs/toolchain@v1
2930
with:
30-
toolchain: 1.56.0
31+
toolchain: 1.57.0
3132
override: true
3233
- name: Install Win 10 SDK
3334
uses: ilammy/msvc-dev-cmd@v1
@@ -59,7 +60,7 @@ jobs:
5960
run: choco install llvm
6061
- uses: actions-rs/toolchain@v1
6162
with:
62-
toolchain: 1.56.0
63+
toolchain: 1.57.0
6364
override: true
6465
- name: Install Win 10 SDK
6566
uses: ilammy/msvc-dev-cmd@v1
@@ -95,11 +96,17 @@ jobs:
9596
platform: x86
9697
- uses: actions-rs/toolchain@v1
9798
with:
98-
toolchain: 1.56.0
99+
toolchain: 1.57.0
99100
override: true
100101
target: i686-pc-windows-msvc
101102
- name: Install Win 10 SDK
102103
uses: ilammy/msvc-dev-cmd@v1
104+
- name: Clone vcpkg
105+
run: git clone --depth 1 --single-branch --recursive https://github.com/microsoft/vcpkg.git
106+
- name: Setup vcpkg
107+
run: cd vcpkg && bootstrap-vcpkg.bat && vcpkg integrate install
108+
- name: Install dependencies
109+
run: cd vcpkg && vcpkg install leptonica:x86-windows-static-md
103110
- name: build Release-Full
104111
env:
105112
LIBCLANG_PATH: "C:\\Program Files\\LLVM\\lib"
@@ -129,9 +136,15 @@ jobs:
129136
with:
130137
version: latest
131138
platform: x86
139+
- name: Clone vcpkg
140+
run: git clone --depth 1 --single-branch --recursive https://github.com/microsoft/vcpkg.git
141+
- name: Setup vcpkg
142+
run: cd vcpkg && bootstrap-vcpkg.bat && vcpkg integrate install
143+
- name: Install dependencies
144+
run: cd vcpkg && vcpkg install leptonica:x86-windows-static-md
132145
- uses: actions-rs/toolchain@v1
133146
with:
134-
toolchain: 1.56.0
147+
toolchain: 1.57.0
135148
override: true
136149
target: i686-pc-windows-msvc
137150
- name: Install Win 10 SDK

0 commit comments

Comments
 (0)