Skip to content

Commit

Permalink
Update sonarcloud-cli to 4.8.0.2856, Conan to 1.57.0, and c++ deps (#46)
Browse files Browse the repository at this point in the history
* Update sonarcloud-cli to 4.8.0.2856, Conan to 1.57.0, and c++ deps :
- boost/1.81.0
- gtest/1.13.0
- spdlog/1.11.0

* Update workflows
  • Loading branch information
loic-lopez authored Jan 27, 2023
1 parent 7d6f5fd commit 709c29d
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/cmake_with_conan_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ jobs:
fetch-depth: 0

- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
versionSpec: '5.x'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
useConfigFile: true

Expand Down
12 changes: 8 additions & 4 deletions .github/workflows/leaf_runtime_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ on:
branches: [ main ]
paths:
- "docker/runtime/**"
- "docker/cmake_with_conan/**"
- "app/**"
- "*.txt"
- "CMakeLists.txt"
- "conanfile.txt"
pull_request:
branches: [ main ]
paths:
- "docker/runtime/**"
- "docker/cmake_with_conan/**"
- "app/**"
- "*.txt"
- "CMakeLists.txt"
- "conanfile.txt"
workflow_dispatch:

jobs:
Expand All @@ -28,13 +32,13 @@ jobs:
fetch-depth: 0

- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
versionSpec: '5.x'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
useConfigFile: true

Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/leaf_sonar_scan_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,15 @@ on:
paths:
- "app/**"
- ".github/workflows/leaf_sonar_scan_workflow.yml"
- "CMakeLists.txt"
- "conanfile.txt"
pull_request:
branches: [ main ]
paths:
- "app/**"
- ".github/workflows/leaf_sonar_scan_workflow.yml"
- "CMakeLists.txt"
- "conanfile.txt"
workflow_dispatch:

jobs:
Expand Down Expand Up @@ -39,7 +43,7 @@ jobs:
apt-get install -y dotnet-sdk-6.0
- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
versionSpec: '5.x'

Expand Down Expand Up @@ -71,7 +75,7 @@ jobs:

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
useConfigFile: true

Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/sonar_cloud_scanner_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ on:
branches: [ main ]
paths:
- "docker/sonar_cloud_scanner/**"
- "docker/cmake_with_conan/**"
pull_request:
branches: [ main ]
paths:
- "docker/sonar_cloud_scanner/**"
- "docker/cmake_with_conan/**"
workflow_dispatch:

jobs:
Expand All @@ -24,13 +26,13 @@ jobs:
fetch-depth: 0

- name: Install GitVersion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
versionSpec: '5.x'

- name: Determine Version
id: gitversion
uses: gittools/actions/gitversion/[email protected].13
uses: gittools/actions/gitversion/[email protected].15
with:
useConfigFile: true

Expand Down
18 changes: 14 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,10 +1,22 @@
cmake_minimum_required(VERSION 3.17)
project(Leaf LANGUAGES CXX VERSION "0.0.1")

if (DEFINED ENV{semVer})
set(GIT_VERSION ENV{semVer})
else()
string(TIMESTAMP GIT_VERSION "%Y.%m.%d")
endif()

message(STATUS "Found version ${GIT_VERSION}")

project(Leaf LANGUAGES CXX VERSION ${GIT_VERSION})

set(CMAKE_CXX_STANDARD 20)

add_definitions(-DUSE32bit=false)
add_definitions(-DCMAKE_GENERATOR_PLATFORM=x64)
## Set variables for libraries
# as for now std::format is not available
# add_definitions(-DSPDLOG_USE_STD_FORMAT=ON)

if (NOT EXISTS ${CMAKE_BINARY_DIR}/CMakeCache.txt)
if (NOT CMAKE_BUILD_TYPE)
Expand Down Expand Up @@ -70,9 +82,7 @@ if (NOT EXISTS "${CMAKE_BINARY_DIR}/conan.cmake")
endif ()


## Set variables for libraries
# as for now std::format is not available
# add_definitions(-DSPDLOG_USE_STD_FORMAT)


include(${CMAKE_BINARY_DIR}/conan.cmake)
conan_cmake_run(
Expand Down
6 changes: 3 additions & 3 deletions conanfile.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[requires]
boost/1.80.0
gtest/1.12.1
spdlog/1.10.0
boost/1.81.0
gtest/1.13.0
spdlog/1.11.0

[options]
gtest:build_gmock=True
Expand Down
2 changes: 1 addition & 1 deletion docker/cmake_with_conan/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM gcc:12

ARG CONAN_VERSION=1.53.0
ARG CONAN_VERSION=1.57.0

LABEL org.opencontainers.image.source="https://github.com/loic-lopez/leaf"
LABEL org.opencontainers.image.authors="Loïc LOPEZ"
Expand Down
2 changes: 1 addition & 1 deletion docker/sonar_cloud_scanner/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:stable-slim as sonar_cloud_scanner_builder

ARG SONAR_SCANNER_VERSION=4.7.0.2747
ARG SONAR_SCANNER_VERSION=4.8.0.2856

RUN mkdir /tools/

Expand Down

0 comments on commit 709c29d

Please sign in to comment.