Skip to content

Commit

Permalink
Update build
Browse files Browse the repository at this point in the history
  • Loading branch information
chronoxor committed Sep 27, 2023
1 parent 0a7a9b5 commit f0e8fac
Show file tree
Hide file tree
Showing 15 changed files with 195 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-linux-clang.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup required packages"
run: sudo apt-get install -y binutils-dev libssl-dev uuid-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-linux-gcc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup required packages"
run: sudo apt-get install -y binutils-dev libssl-dev uuid-dev
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup python"
uses: actions/setup-python@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows-cygwin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
shell: cmd
run: git config --global core.autocrlf input

- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup Cygwin"
uses: cygwin/cygwin-install-action@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows-mingw.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup cmake"
run: cmake --version
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows-msys2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
run:
shell: msys2 {0}
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup MSYS2"
uses: msys2/setup-msys2@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows-vs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
build:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup Visual Studio"
uses: egor-tensin/vs-shell@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/doxygen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
git config --global user.name "${{ github.actor }}"
git config --global user.email "${{ github.actor }}@users.noreply.github.com"
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: "Setup cmake"
run: cmake --version
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ if(NOT CPPTEMPLATE_MODULE)
file(GLOB TESTS_SOURCE_FILES "tests/*.cpp")
add_executable(cpptemplate-tests ${TESTS_HEADER_FILES} ${TESTS_INLINE_FILES} ${TESTS_SOURCE_FILES})
set_target_properties(cpptemplate-tests PROPERTIES COMPILE_FLAGS "${PEDANTIC_COMPILE_FLAGS}" FOLDER "tests")
target_include_directories(cpptemplate-tests PRIVATE Catch2::Catch2)
target_link_libraries(cpptemplate-tests ${LINKLIBS} Catch2::Catch2WithMain)
target_include_directories(cpptemplate-tests PRIVATE Catch2)
target_link_libraries(cpptemplate-tests ${LINKLIBS} Catch2)
list(APPEND INSTALL_TARGETS cpptemplate-tests)
list(APPEND INSTALL_TARGETS_PDB cpptemplate-tests)

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2016-2023 Ivan Shynkarenka
Copyright (c) 2016-2024 Ivan Shynkarenka

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
# CppTemplate

[![License](https://img.shields.io/badge/License-MIT-green.svg)](LICENSE)
[![Release](https://img.shields.io/github/release/chronoxor/CppTemplate.svg?sort=semver)](https://github.com/chronoxor/CppTemplate/releases)
<br/>
[![Linux (clang)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-linux-clang.yml/badge.svg)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-linux-clang.yml)
[![Linux (gcc)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-linux-gcc.yml/badge.svg)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-linux-gcc.yml)
<br/>
[![MacOS](https://github.com/chronoxor/CppTemplate/actions/workflows/build-macos.yml/badge.svg)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-macos.yml)
<br/>
[![Windows (Cygwin)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-windows-cygwin.yml/badge.svg)](https://github.com/chronoxor/CppTemplate/actions/workflows/build-windows-cygwin.yml)
Expand Down
Loading

0 comments on commit f0e8fac

Please sign in to comment.