Skip to content

Commit ff0446a

Browse files
committed
Added more workflow corrections for handling dependencies
1 parent 52845e8 commit ff0446a

File tree

3 files changed

+90
-56
lines changed

3 files changed

+90
-56
lines changed

.github/workflows/package-release.yml

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,22 +33,37 @@ jobs:
3333
libwebsockets-dev \
3434
libcjson-dev \
3535
libssl-dev \
36-
dpkg-dev
36+
dpkg-dev \
37+
doxygen \
38+
graphviz
3739
3840
- name: Build library
3941
run: |
4042
mkdir -p build
4143
cd build
42-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
44+
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_TESTS=ON -DBUILD_EXAMPLES=ON ..
4345
make -j$(nproc)
4446
45-
- name: Run tests (if OBS available)
47+
- name: Generate Doxygen documentation
4648
run: |
4749
cd build
48-
if [ -f test ]; then
49-
echo "Tests available but require OBS running on localhost:4455"
50-
# ./test -h localhost -p 4455 || echo "OBS not available, skipping"
51-
fi
50+
make doc
51+
continue-on-error: true
52+
53+
- name: Check built artifacts
54+
run: |
55+
cd build
56+
echo "=== Built Executables ==="
57+
if [ -f test ]; then echo "✓ Test executable built"; fi
58+
if [ -f obsws_example ]; then echo "✓ Example executable built"; fi
59+
echo ""
60+
echo "=== Compiled Objects and Libraries ==="
61+
find . -maxdepth 2 -type f \( -name "*.o" -o -name "*.a" -o -name "*.so" \) | sort
62+
63+
- name: Skip OBS tests (setup later)
64+
run: |
65+
echo "Tests built but not executed - OBS server setup required"
66+
echo "Tests will be integrated when remote OBS server is available"
5267
continue-on-error: true
5368

5469
- name: Create .deb package
@@ -80,6 +95,14 @@ jobs:
8095
name: libwsv5-packages
8196
path: build/libwsv5_*
8297

98+
- name: Upload documentation
99+
uses: actions/upload-artifact@v4
100+
with:
101+
name: libwsv5-docs
102+
path: build/doc/html/
103+
if: hashFiles('build/doc/html/*') != ''
104+
continue-on-error: true
105+
83106
- name: Create Release
84107
if: startsWith(github.ref, 'refs/tags/v')
85108
uses: softprops/action-gh-release@v1
@@ -92,5 +115,6 @@ jobs:
92115
draft: false
93116
prerelease: false
94117
body_path: .github/RELEASE_TEMPLATE.md
118+
generate_release_notes: true
95119
env:
96120
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 58 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,66 @@
1-
# Prerequisites
2-
*.d
1+
# Build directories
2+
build/
3+
cmake-build-*/
4+
out/
5+
6+
.zencoder/
37

4-
# Object files
8+
# Compiled files
59
*.o
6-
*.ko
7-
*.obj
8-
*.elf
10+
*.a
11+
*.so
12+
*.dylib
13+
*.dll
14+
*.exe
915

10-
# Linker output
11-
*.ilk
12-
*.map
13-
*.exp
16+
# CMake files
17+
CMakeCache.txt
18+
CMakeFiles/
19+
cmake_install.cmake
20+
Makefile
21+
*.cmake
22+
!CMakeLists.txt
1423

15-
# Precompiled Headers
16-
*.gch
17-
*.pch
24+
# IDE files
25+
.vscode/
26+
.idea/
27+
*.swp
28+
*.swo
29+
*~
30+
.DS_Store
1831

19-
# Libraries
20-
*.lib
21-
*.a
22-
*.la
23-
*.lo
32+
# Example binaries
33+
obsws_example
34+
example
2435

25-
# Shared objects (inc. Windows DLLs)
26-
*.dll
27-
*.so
28-
*.so.*
29-
*.dylib
36+
# Log files
37+
*.log
3038

31-
# Executables
32-
*.exe
33-
*.out
34-
*.app
35-
*.i*86
36-
*.x86_64
37-
*.hex
38-
39-
# Debug files
40-
*.dSYM/
41-
*.su
42-
*.idb
43-
*.pdb
44-
45-
# Kernel Module Compile Results
46-
*.mod*
47-
*.cmd
48-
.tmp_versions/
49-
build/
50-
modules.order
51-
Module.symvers
52-
Mkfile.old
53-
dkms.conf
39+
# Python cache (from original script)
40+
__pycache__/
41+
*.pyc
42+
*.pyo
43+
venv/
44+
.venv/
45+
46+
# Backup files
47+
*.bak
48+
*.backup
49+
*~
50+
51+
# Documentation build
52+
#doc/
53+
#docs/
54+
#docs/_build/
55+
#docs/html/
56+
#docs/latex/
57+
58+
# Package files
59+
*.tar.gz
60+
*.zip
61+
*.deb
62+
*.rpm
5463

55-
# debug information files
56-
*.dwo
64+
# Build artifacts directories
65+
release-artifacts/
66+
build-release/

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libwsv5.pc
113113
)
114114

115115
# Doxygen documentation generation
116-
find_package(Doxygen REQUIRED OPTIONAL_COMPONENTS dot)
116+
find_package(Doxygen OPTIONAL_COMPONENTS dot)
117117

118118
if(DOXYGEN_FOUND)
119119
# Configure Doxyfile via CMake variables

0 commit comments

Comments
 (0)