Skip to content

Commit 74e7061

Browse files
authored
Merge pull request #12 from sir-gon/develop
[BUGFIX] [CONFIG] [Makefile] /usr/local/share/vcpkg/.vcpkg-root: erro…
2 parents c593dcc + b78b8ae commit 74e7061

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

.github/workflows/sonarcloud.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on: # yamllint disable-line rule:truthy
1010

1111
jobs:
1212
build:
13-
name: Build
13+
name: SonarCloud build and run sonar-scanner
1414
runs-on: ubuntu-latest
1515
env:
1616
# Directory where build-wrapper output will be placed

.github/workflows/yamllint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on: # yamllint disable-line rule:truthy
1212

1313
jobs:
1414
lint:
15+
name: YAML lint
1516
runs-on: ubuntu-latest
1617
steps:
1718
- name: Checkout repository

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ build: dependencies
5656
cmake --build build --verbose
5757

5858
dependencies:
59-
vcpkg integrate install
60-
vcpkg install
59+
vcpkg --x-wait-for-lock integrate install
60+
vcpkg --x-wait-for-lock install
6161

6262
lint/markdown:
6363
markdownlint '**/*.md' && echo '✔ Your code looks good.'

0 commit comments

Comments
 (0)