Skip to content

Commit f8268f0

Browse files
committed
clean-up and add VCPKG_MAX_CONCURRENCY env variable
Signed-off-by: Iacopo Rozzo <[email protected]>
1 parent 7dc2ada commit f8268f0

File tree

5 files changed

+14
-13
lines changed

5 files changed

+14
-13
lines changed

.github/actions/install-vcpkg/action.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,11 @@ runs:
2929
# Note, this is a workaround to avoid building debug versions that are not used in the build process
3030
# TODO: Find a cleaner way to do this
3131
find "$(pwd)/vcpkg/triplets/" -name "*.cmake" -type f -exec sh -c "echo \"set(VCPKG_BUILD_TYPE release)\" >> {}" \;
32-
./vcpkg/bootstrap-vcpkg.sh
32+
VCPKG_MAX_CONCURRENCY=6 ./vcpkg/bootstrap-vcpkg.sh
3333
echo "$(pwd)/vcpkg" >> $GITHUB_PATH
3434
echo "VCPKG_ROOT=$(pwd)/vcpkg" >> $GITHUB_ENV
35+
# Set the maximum concurrency to 6 to avoid overwhelming the CI system
36+
echo "VCPKG_MAX_CONCURRENCY=6" >> $GITHUB_ENV
3537
3638
- name: Set Outputs
3739
id: store-outputs

.github/workflows/k8smeta-ci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ jobs:
5050
- name: Build k8s meta plugin 🏗️
5151
run: |
5252
cd plugins/k8smeta
53-
cmake -S . -B build --preset default
53+
cmake -B build --preset vcpkg-release
5454
cmake --build build --target k8smeta -j$(nproc)
5555
5656
- name: Perform CodeQL Analysis

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.vscode
33
.DS_Store
44
.idea
5+
.cache
56
output/
67
plugins/*/*.so
78
plugins/*/lib*.h

plugins/k8smeta/CMakePresets.json

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,23 @@
22
"version": 3,
33
"configurePresets": [
44
{
5-
"name": "default",
6-
"displayName": "Default Configuration",
7-
"description": "Default build configuration with vcpkg",
5+
"name": "vcpkg-release",
6+
"displayName": "VCPKG Release Configuration",
7+
"description": "VCPKG release build configuration",
88
"generator": "Unix Makefiles",
9-
"binaryDir": "${sourceDir}/build",
109
"cacheVariables": {
1110
"CMAKE_BUILD_TYPE": "Release",
1211
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
13-
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
14-
"VCPKG_BUILD_TYPE": "release"
12+
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
1513
}
1614
}
1715
],
1816
"buildPresets": [
1917
{
20-
"name": "default",
21-
"configurePreset": "default",
22-
"displayName": "Default Build",
23-
"description": "Build with default configuration"
18+
"name": "vcpkg-release",
19+
"configurePreset": "vcpkg-release",
20+
"displayName": "VCPKG Release Build",
21+
"description": "Build with VCPKG release configuration"
2422
}
2523
]
2624
}

plugins/k8smeta/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ clean:
2424
# This Makefile requies CMake installed on the system
2525
.PHONY: $(OUTPUT)
2626
$(OUTPUT):
27-
cmake -S . -B build --preset default && cmake --build build --target k8smeta -j$(nproc) && cp ./build/$(OUTPUT) ./$(OUTPUT)
27+
cmake -B build --preset vcpkg-release && cmake --build build --target k8smeta -j$(nproc) && cp ./build/$(OUTPUT) ./$(OUTPUT)
2828

2929
readme:
3030
@$(READMETOOL) -p ./$(OUTPUT) -f README.md

0 commit comments

Comments
 (0)