Skip to content

Commit

Permalink
Export of fmt not neccesary and minimal changes on actions
Browse files Browse the repository at this point in the history
  • Loading branch information
bautisflow committed Jun 13, 2024
1 parent a0dad62 commit afc09d7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 11 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
version: ${{ steps.version.outputs.version }}
steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Get tag version
id : version
Expand All @@ -47,7 +47,7 @@ jobs:
steps:

- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ needs.build_version.outputs.version }}
Expand All @@ -57,10 +57,10 @@ jobs:

- name: Build
# Build your program with the given configuration
run: cmake --build /build --config ${{ env.BUILD_TYPE }}
run: cmake --build /build --config ${{ env.BUILD_TYPE }} -- -j$(nproc)

- name: Upload build artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: ${{ github.event_name == 'release' }}
with:
name: ${{ env.MODULE }}.${{ matrix.architecture }}
Expand All @@ -83,7 +83,7 @@ jobs:
steps:

- name: Download ${{ matrix.architecture }} binary
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: ${{ env.MODULE }}.${{ matrix.architecture }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/static-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ jobs:

build:
name: Build
#runs-on: ubuntu-22.04
runs-on: [self-hosted, Linux, X64]
runs-on: ubuntu-22.04
#runs-on: [self-hosted, Linux, X64]
env:
BUILD_WRAPPER_OUT_DIR: build_wrapper_output_directory # Directory where build-wrapper output will be placed
steps:
Expand Down
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ list(APPEND ADDITIONAL_LIBS httplib::httplib)
FetchContent_Declare(
thinger_iotmp
GIT_REPOSITORY https://github.com/thinger-io/IOTMP-Linux.git
GIT_TAG 1.2.2
GIT_TAG 1.3.0
)
FetchContent_MakeAvailable(thinger_iotmp)
list(APPEND ADDITIONAL_LIBS thinger_iotmp)
Expand All @@ -173,9 +173,9 @@ export(TARGETS httplib
NAMESPACE httplib::
FILE ${CMAKE_CURRENT_BINARY_DIR}/httplibTargets.cmake)

export(TARGETS fmt
NAMESPACE fmt::
FILE ${CMAKE_CURRENT_BINARY_DIR}/fmtTargets.cmake)
#export(TARGETS fmt
# NAMESPACE fmt::
# FILE ${CMAKE_CURRENT_BINARY_DIR}/fmtTargets.cmake)

export(TARGETS spdlog
NAMESPACE spdlog::
Expand Down

0 comments on commit afc09d7

Please sign in to comment.