Skip to content

Commit a5e7b6c

Browse files
author
Gonzalo Diaz
committed
[CONFIG] [Github Actions] build dependencies simplified.
1 parent 758805c commit a5e7b6c

File tree

5 files changed

+26
-27
lines changed

5 files changed

+26
-27
lines changed

.github/workflows/clang-format.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,13 @@ jobs:
2626
sudo apt-add-repository "deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy main"
2727
sudo apt-get -y update
2828
sudo apt-get -y install --no-install-recommends --no-install-suggests clang-format
29+
# yamllint enable rule:line-length
30+
31+
- name: Check Tools
32+
run: |
33+
make --version
34+
cmake --version
2935
clang-format --version
30-
# yamllint enable rule:line-length
3136
3237
- name: Style Check
3338
run: make test/styling

.github/workflows/codeql.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,7 @@ jobs:
8181
8282
- name: Install dependencies
8383
run: |
84-
vcpkg --x-wait-for-lock integrate install
85-
vcpkg --x-wait-for-lock install
84+
make dependencies
8685
8786
# Initializes the CodeQL tools for scanning.
8887
- name: Initialize CodeQL
@@ -112,12 +111,7 @@ jobs:
112111
shell: bash
113112
run: |
114113
export VCPKG_ROOT=/usr/local/share/vcpkg
115-
cmake --preset debug -B build
116-
cmake --preset debug \
117-
-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
118-
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
119-
build
120-
cmake --build build --verbose
114+
make build
121115
122116
- name: Perform CodeQL Analysis
123117
uses: github/codeql-action/analyze@v3

.github/workflows/cpp-coverage.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,13 @@ jobs:
3232
3333
- name: Install dependencies
3434
run: |
35-
vcpkg --x-wait-for-lock integrate install
36-
vcpkg --x-wait-for-lock install
35+
make dependencies
3736
3837
# yamllint disable rule:line-length
3938
- name: Build
4039
run: |
4140
export VCPKG_ROOT=/usr/local/share/vcpkg
42-
cmake --preset debug -B build
43-
cmake --preset debug \
44-
-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
45-
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
46-
build
47-
cmake --build build --verbose
41+
make build
4842
# yamllint enable rule:line-length
4943

5044
- name: Test / Coverage

.github/workflows/cpp.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,19 +34,13 @@ jobs:
3434
3535
- name: Install dependencies
3636
run: |
37-
vcpkg --x-wait-for-lock integrate install
38-
vcpkg --x-wait-for-lock install
37+
make dependencies
3938
4039
# yamllint disable rule:line-length
4140
- name: Build
4241
run: |
4342
export VCPKG_ROOT=/usr/local/share/vcpkg
44-
cmake --preset debug -B build
45-
cmake --preset debug \
46-
-DCMAKE_TOOLCHAIN_FILE=/usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake \
47-
-DCMAKE_EXPORT_COMPILE_COMMANDS=1 \
48-
build
49-
cmake --build build --verbose
43+
make build
5044
# yamllint enable rule:line-length
5145

5246
- name: Test

.github/workflows/cppcheck.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,23 @@ jobs:
1919
- name: Checkout repository
2020
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2121

22-
- name: Install dependencies
22+
- name: Install tools
2323
run: |
2424
sudo apt-get update
2525
sudo apt-get install cppcheck
26+
27+
- name: Check Tools
28+
run: |
29+
make --version
30+
cmake --version
31+
vcpkg --version
2632
cppcheck --version
2733
34+
- name: Install dependencies
35+
run: |
36+
make dependencies
37+
2838
- name: Lint
29-
run: make test/static
39+
run: |
40+
export VCPKG_ROOT=/usr/local/share/vcpkg
41+
make test/static

0 commit comments

Comments
 (0)