Skip to content

Commit cd95aff

Browse files
committed
Merge branch 'main' of github.com:fishca/v8_reader_wx
2 parents 82ca251 + 6f167b4 commit cd95aff

2 files changed

Lines changed: 115 additions & 1 deletion

File tree

.github/workflows/build-zlib.yml

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
name: Build zlib (Windows)
2+
3+
on:
4+
push:
5+
branches: [ main ]
6+
pull_request:
7+
branches: [ main ]
8+
workflow_dispatch:
9+
10+
jobs:
11+
build-windows:
12+
runs-on: windows-latest
13+
14+
steps:
15+
- uses: actions/checkout@v4
16+
with:
17+
submodules: recursive
18+
19+
- name: Clone zlib if not present
20+
run: |
21+
if (-not (Test-Path "3rdparty/zlib/CMakeLists.txt")) {
22+
Remove-Item -Recurse -Force "3rdparty/zlib" -ErrorAction SilentlyContinue
23+
New-Item -ItemType Directory -Force "3rdparty/zlib" | Out-Null
24+
git clone --depth 1 --branch v1.3.1 https://github.com/madler/zlib.git tmp_zlib
25+
Copy-Item -Path "tmp_zlib/*" -Destination "3rdparty/zlib/" -Recurse
26+
Remove-Item -Recurse -Force "tmp_zlib"
27+
}
28+
29+
- name: Setup MSVC
30+
uses: ilammy/msvc-dev-cmd@v1
31+
32+
- name: Configure CMake
33+
run: |
34+
cmake -B build `
35+
-S . `
36+
-DV8_READER_BUILD_GUI=OFF `
37+
-DV8_READER_BUILD_CLI=ON `
38+
-DV8_READER_BUILD_TESTS=OFF `
39+
-DCMAKE_BUILD_TYPE=Release
40+
41+
- name: Build project
42+
run: |
43+
cmake --build build --config Release -j
44+
45+
- name: Verify zlibstatic.lib
46+
run: |
47+
Get-ChildItem -Recurse "build" -Filter "*.lib" | Select-Object FullName
48+
if ((Test-Path "build/lib/zlibstatic.lib") -or (Test-Path "build/zlib_build/Release/zlibstatic.lib") -or (Test-Path "build/Release/zlibstatic.lib")) {
49+
Write-Host "SUCCESS: zlibstatic.lib created"
50+
ls build/lib/
51+
} else {
52+
Write-Error "FAILED: zlibstatic.lib not found"
53+
exit 1
54+
}
55+
56+
- name: Upload artifact
57+
uses: actions/upload-artifact@v4
58+
with:
59+
name: zlibstatic-windows
60+
path: |
61+
build/lib/zlibstatic.lib
62+
build/zlib_build/Release/zlibstatic.lib
63+
build/Release/zlibstatic.lib
64+
retention-days: 7
65+
66+
build-linux:
67+
runs-on: ubuntu-latest
68+
69+
steps:
70+
- uses: actions/checkout@v4
71+
with:
72+
submodules: recursive
73+
74+
- name: Clone zlib if not present
75+
run: |
76+
if [ ! -f "3rdparty/zlib/CMakeLists.txt" ]; then
77+
rm -rf 3rdparty/zlib
78+
git clone --depth 1 --branch v1.3.1 https://github.com/madler/zlib.git 3rdparty/zlib
79+
fi
80+
81+
- name: Install dependencies
82+
run: |
83+
sudo apt-get update
84+
sudo apt-get install -y cmake build-essential
85+
86+
- name: Configure CMake
87+
run: |
88+
cmake -B build \
89+
-S . \
90+
-DV8_READER_BUILD_GUI=OFF \
91+
-DV8_READER_BUILD_CLI=ON \
92+
-DV8_READER_BUILD_TESTS=OFF \
93+
-DCMAKE_BUILD_TYPE=Release
94+
95+
- name: Build zlibstatic
96+
run: |
97+
cmake --build build --target zlibstatic -j$(nproc)
98+
99+
- name: Verify libz.a
100+
run: |
101+
if [ -f "build/lib/libz.a" ]; then
102+
echo "SUCCESS: libz.a created"
103+
ls -la build/lib/
104+
else
105+
echo "FAILED: libz.a not found"
106+
exit 1
107+
fi
108+
109+
- name: Upload artifact
110+
uses: actions/upload-artifact@v4
111+
with:
112+
name: zlibstatic-linux
113+
path: build/lib/libz.a
114+
retention-days: 7

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
1010

1111
# Опции сборки
1212
option(V8_READER_BUILD_GUI "Собрать GUI приложение на wxWidgets" ON)
13-
option(V8_READER_BUILD_CLI "Собрать консольное приложение" ON)
13+
option(V8_READER_BUILD_CLI "Собрать консольное приложение" OFF)
1414
option(V8_READER_BUILD_TESTS "Собрать тесты" OFF)
1515

1616
# Пути

0 commit comments

Comments
 (0)