From 51d3d641755f6a6275636ef8499f99715c679fb7 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 5 Dec 2025 11:59:17 -0500 Subject: [PATCH 1/4] chore: new editorconfig and fixed CMakeLists.txt Signed-off-by: Amlal El Mahrouss --- .editorconfig | 16 ++++++++++++++++ CMakeLists.txt | 10 +++++----- 2 files changed, 21 insertions(+), 5 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..5ab5d39 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,16 @@ +root = true + +[*.{cc,h,inl}] +indent_size = 4 +tab_width = 4 +indent_style = space + +[*.{pro,pri}] +indent_size = 4 +tab_width = 4 +indent_style = space + +[*.{md,markdown}] +indent_size = 2 +tab_width = 2 +indent_style = space diff --git a/CMakeLists.txt b/CMakeLists.txt index 78ab417..c4af61e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,15 +6,15 @@ set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) -include_directories(${CMAKE_SOURCE_DIR}/dev ${CMAKE_SOURCE_DIR}/vendor) +include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/vendor) -file(GLOB NEBUILD_CLI_SOURCES "${CMAKE_SOURCE_DIR}/dev/cli/*.cc") -file(GLOB NEBUILD_SRC_SOURCES "${CMAKE_SOURCE_DIR}/dev/src/*.cc") +file(GLOB NEBUILD_CLI_SOURCES "${CMAKE_SOURCE_DIR}/src/cli/*.cc") +file(GLOB NEBUILD_SRC_SOURCES "${CMAKE_SOURCE_DIR}/src/lib/*.cc") set(NEBUILD_SOURCES ${NEBUILD_CLI_SOURCES} ${NEBUILD_SRC_SOURCES}) add_executable(nebuild ${NEBUILD_SOURCES}) -target_include_directories(nebuild PRIVATE ${CMAKE_SOURCE_DIR}/dev ${CMAKE_SOURCE_DIR}/vendor) +target_include_directories(nebuild PRIVATE ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/vendor) option(BUILD_WINDOWS "Produce a Windows executable name (nebuild.exe)" OFF) @@ -34,5 +34,5 @@ add_custom_target(build-nebuild-windows message(STATUS "Project: nebuild") message(STATUS "Sources: ${NEBUILD_SOURCES}") -message(STATUS "Include dirs: ${CMAKE_SOURCE_DIR}/dev;${CMAKE_SOURCE_DIR}/vendor") +message(STATUS "Include dirs: ${CMAKE_SOURCE_DIR}/src;${CMAKE_SOURCE_DIR}/vendor") message(STATUS "To build for Windows-style executable: configure with -DBUILD_WINDOWS=ON") From 3652a5d4631071fac1725326065858f220a169fc Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 5 Dec 2025 11:59:45 -0500 Subject: [PATCH 2/4] chore: fixed CI. Signed-off-by: Amlal El Mahrouss --- .github/workflows/c-cpp.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index f9b8e2a..5bd4c24 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -2,9 +2,9 @@ name: C/C++ CI on: push: - branches: [ "master" ] + branches: [ "stable" ] pull_request: - branches: [ "master" ] + branches: [ "stable" ] jobs: build: From fd769c763ff01b8355570e044e818d291bc8b648 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 5 Dec 2025 12:00:49 -0500 Subject: [PATCH 3/4] chore: a version of CI for develop. Signed-off-by: Amlal El Mahrouss --- .github/workflows/c-cpp-dev.yml | 19 +++++++++++++++++++ .github/workflows/c-cpp.yml | 2 +- ReadMe.md | 1 + 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/c-cpp-dev.yml diff --git a/.github/workflows/c-cpp-dev.yml b/.github/workflows/c-cpp-dev.yml new file mode 100644 index 0000000..e2ba91f --- /dev/null +++ b/.github/workflows/c-cpp-dev.yml @@ -0,0 +1,19 @@ +name: C/C++ CI (Develop,Clang++) + +on: + push: + branches: [ "develop" ] + pull_request: + branches: [ "develop" ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + - name: Install Packages + run: sudo apt update && sudo apt install build-essential + - name: Build NeBuild + run: make build-nebuild \ No newline at end of file diff --git a/.github/workflows/c-cpp.yml b/.github/workflows/c-cpp.yml index 5bd4c24..d03c7df 100644 --- a/.github/workflows/c-cpp.yml +++ b/.github/workflows/c-cpp.yml @@ -1,4 +1,4 @@ -name: C/C++ CI +name: C/C++ CI (Stable,Clang++) on: push: diff --git a/ReadMe.md b/ReadMe.md index bb4d4dc..0a3eb57 100644 --- a/ReadMe.md +++ b/ReadMe.md @@ -1,6 +1,7 @@ # NeBuild ![CI](https://github.com/nekernel-org/nebuild/actions/workflows/c-cpp.yml/badge.svg) +![CI](https://github.com/nekernel-org/nebuild/actions/workflows/c-cpp-dev.yml/badge.svg) [![License: GPL-3.0](https://img.shields.io/badge/license-BSD--3.0-blue.svg)](LICENSE) ## Requirements: From 26783733863f62c468a4c8cb2853badd54e30a39 Mon Sep 17 00:00:00 2001 From: Amlal El Mahrouss Date: Fri, 5 Dec 2025 12:02:43 -0500 Subject: [PATCH 4/4] chore: rename README.md Signed-off-by: Amlal El Mahrouss --- ReadMe.md => README.md | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename ReadMe.md => README.md (100%) diff --git a/ReadMe.md b/README.md similarity index 100% rename from ReadMe.md rename to README.md