Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix cmake preset file and github action config #11

Merged
merged 8 commits into from
Oct 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 9 additions & 14 deletions .github/workflows/checkin_cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
name: checkin on github

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]

Expand All @@ -22,34 +20,33 @@ jobs:
#
# To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
matrix:
os: [ubuntu-latest, windows-latest]
os: [ubuntu-24.04, windows-latest]
build_type: [Release]
c_compiler: [gcc, cl]
include:
- os: windows-latest
c_compiler: cl
cpp_compiler: cl
cmake_configpreset_name: MSVC_x64_release
cmake_buildpreset_name: msvc_x64_build_release
cmake_testpreset_name: checkin_windows
- os: ubuntu-latest
cmake_workflow_preset_name: cicd_on_windows
- os: ubuntu-24.04
c_compiler: gcc
cpp_compiler: g++
cmake_configpreset_name: linux_gcc_x64_release
cmake_buildpreset_name: linux_x64_build_release
cmake_testpreset_name: checkin_linux
cmake_workflow_preset_name: cicd_on_linux
exclude:
- os: windows-latest
c_compiler: gcc
- os: windows-latest
c_compiler: clang
- os: ubuntu-latest
- os: ubuntu-24.04
c_compiler: cl

steps:
- name: checkout repository
uses: actions/checkout@v4

- name: set up ninja
uses: ashutoshvarma/[email protected]

- name: set up vcpkg
uses: lukka/[email protected]
with:
Expand All @@ -59,8 +56,6 @@ jobs:
- name: config, build and test
uses: lukka/[email protected]
with:
configurePreset: ${{ matrix.cmake_preset_name }}
buildPreset: ${{ matrix.cmake_buildpreset_name }}
testPreset: ${{ matrix.cmake_testpreset_name }}
workflowPreset: ${{ matrix.cmake_workflow_preset_name }}
env:
VCPKG_ROOT: ${{ runner.workspace }}/vcpkg
21 changes: 19 additions & 2 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"configurePresets": [
{
"name": "linux_gcc_x64_debug",
"displayName": "GCC 13.2.0 x86_64-linux-gnu debug mode",
"displayName": "GCC x86_64-linux-gnu debug mode",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"generator": "Ninja",
"cacheVariables": {
Expand All @@ -17,7 +17,7 @@
},
{
"name": "linux_gcc_x64_release",
"displayName": "GCC 13.2.0 x86_64-linux-gnu release mode",
"displayName": "GCC x86_64-linux-gnu release mode",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"generator": "Ninja",
"cacheVariables": {
Expand Down Expand Up @@ -119,6 +119,23 @@
"name": "checkin_windows"
}
]
},
{
"name": "cicd_on_linux",
"steps": [
{
"type": "configure",
"name": "linux_gcc_x64_release"
},
{
"type": "build",
"name": "linux_x64_build_release"
},
{
"type": "test",
"name": "checkin_linux"
}
]
}
]
}
2 changes: 1 addition & 1 deletion submod/core/include/units_extend.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once
#include <units.h>

#include <sstream>
#include <concepts>

namespace units::extend {
Expand Down
6 changes: 1 addition & 5 deletions vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
"gtest",
"fmt",
"units",
"eigen3",
{
"name": "nvidia-cutlass",
"platform": "native"
}
"eigen3"
]
}
Loading