Skip to content

Commit 3678bf1

Browse files
committed
K
1 parent 8508ab1 commit 3678bf1

File tree

3 files changed

+17
-26
lines changed

3 files changed

+17
-26
lines changed

.github/workflows/cmake.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
run: sudo apt update
2222

2323
- name: Install needed deps
24-
run: sudo apt install -y libboost-dev libboost-filesystem-dev libboost-process-dev libconfig++-dev libsqlite3-dev ffmpeg git libjsoncpp-dev
24+
run: sudo apt install -y libboost-dev libboost-filesystem-dev libconfig++-dev libsqlite3-dev ffmpeg git libjsoncpp-dev
2525

2626
- name: Install GCC11
2727
shell: bash
@@ -56,7 +56,7 @@ jobs:
5656
run: sudo apt update
5757

5858
- name: Install needed deps
59-
run: sudo apt install -y libboost-dev libboost-filesystem-dev libboost-process-dev libconfig++-dev libsqlite3-dev ffmpeg git libjsoncpp-dev
59+
run: sudo apt install -y libboost-dev libboost-filesystem-dev libconfig++-dev libsqlite3-dev ffmpeg git libjsoncpp-dev
6060

6161
- name: Install GCC11
6262
run: |

.github/workflows/codeql.yml

Lines changed: 15 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "CodeQL Advanced"
1+
name: "CodeQL Analysis"
22

33
on:
44
push:
@@ -10,8 +10,8 @@ on:
1010

1111
jobs:
1212
analyze:
13-
name: Analyze (${{ matrix.language }})
14-
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
13+
name: Analyze C/C++
14+
runs-on: ubuntu-latest
1515

1616
permissions:
1717
security-events: write
@@ -22,13 +22,8 @@ jobs:
2222
strategy:
2323
fail-fast: false
2424
matrix:
25-
include:
26-
- language: actions
27-
build-mode: none
28-
- language: c-cpp
29-
build-mode: manual
30-
- language: javascript-typescript
31-
build-mode: none
25+
language: [ "c-cpp" ]
26+
build-mode: [ "manual" ]
3227

3328
steps:
3429
- name: Checkout repository
@@ -38,35 +33,32 @@ jobs:
3833
uses: github/codeql-action/init@v4
3934
with:
4035
languages: ${{ matrix.language }}
41-
build-mode: ${{ matrix.build-mode }}
36+
build-mode: manual
4237

43-
- name: Manual C/C++ build
44-
if: matrix.language == 'c-cpp'
45-
shell: bash
38+
# -------------------------
39+
# Manual build for C/C++
40+
# -------------------------
41+
- name: Install dependencies
4642
run: |
4743
sudo apt-get update -y
4844
sudo apt-get install -y \
49-
libboost-dev libboost-filesystem-dev libboost-process-dev \
45+
libboost-dev libboost-filesystem-dev \
5046
libconfig++-dev libsqlite3-dev ffmpeg git libjsoncpp-dev \
51-
gcc-11 g++-11
47+
gcc-11 g++-11 cmake
5248
5349
sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 110 \
5450
--slave /usr/bin/g++ g++ /usr/bin/g++-11 \
5551
--slave /usr/bin/gcov gcov /usr/bin/gcov-11
5652
53+
- name: Build project (single pass)
54+
run: |
5755
cmake -B build -DCMAKE_BUILD_TYPE=Release \
5856
-DENABLE_HEVC=ON -DENABLE_AAC=ON -DENABLE_FDKAAC=ON \
5957
-DENABLE_AC3=ON -DENABLE_EAC3=ON -DENABLE_OPUS=ON
6058
6159
cmake --build build --config Release
6260
63-
cmake -B build -DCMAKE_BUILD_TYPE=Release \
64-
-DENABLE_HEVC=OFF -DENABLE_AAC=OFF -DENABLE_FDKAAC=OFF \
65-
-DENABLE_AC3=OFF -DENABLE_EAC3=OFF -DENABLE_OPUS=OFF
66-
67-
cmake --build build --config Release
68-
6961
- name: Perform CodeQL Analysis
7062
uses: github/codeql-action/analyze@v4
7163
with:
72-
category: "/language:${{matrix.language}}"
64+
category: "/language:c-cpp"

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ endif()
6060

6161
find_package (SQLite3 REQUIRED)
6262
find_package (Config++ REQUIRED)
63-
set(Boost_NO_BOOST_CMAKE ON)
6463
find_package(Boost REQUIRED COMPONENTS filesystem process)
6564
find_package (Git REQUIRED)
6665
find_package (JsonCpp REQUIRED)

0 commit comments

Comments
 (0)