feat(repo) & fix(ci): Do a file structure change on the repo, aswell as make ci.yml be based on a matrix

Author: h4rldev

.cache/clangd/index/main.c.F96C79BFA722860C.idx

@@ -1,2 +1,2 @@
 CompileFlags:
-  Add: [-Wall, -Wextra]
+  Add: [-Wall, -Wextra, -I./]

.clangd

@@ -1,22 +1,25 @@
 name: C Test CI
 on:
   push:
-    branches: [$default-branch]
+    branches: [main]
   pull_request:
-    branches: [$default-branch]
+    branches: [main]
 jobs:
   build:
-    runs-on: ubuntu-24.04
+    strategy:
+      matrix:
+        os: [ubuntu-24.04, windows-latest]
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-      - name: Install mold
+      - name: Install mold on ubuntu systems
+        if: matrix.os == 'ubuntu-24.04'
         uses: rui314/setup-mold@2e332a0b602c2fc65d2d3995941b1b29a5f554a0 # v1
       - name: Install just
         uses: extractions/setup-just@dd310ad5a97d8e7b41793f8ef055398d51ad4de6 # v2
       - name: Test build
         shell: bash
-        run: "just build \n"
+        run: just build
       - name: Run unit-tests
         shell: bash
-        run: |-
-          just test
+        run: just test

.github/workflows/ci.yml

@@ -1,6 +1,8 @@
-/bin/
-/out/
+/build/bin/
+/build/out/
+/build/tests/
 /hsh
 /hamon
 /tests/unity
 /vgcore
+/compile_commands.json

.gitignore

@@ -0,0 +1,6 @@
+cmake_minimum_required(VERSION 3.5)
+project(hamon)
+
+include_directories(include)
+
+add_executable(main src/main.c)

CMakeLists.txt

@@ -46,13 +46,16 @@ __LICENSE__="BSD 3-Clause License"
 __VERSION__="0.1.0"
 
 SRC="$(pwd)/src"
-OUT="$(pwd)/out"
-BIN="$(pwd)/bin"
+BUILD="$(pwd)/build"
+OUT="${BUILD}/out"
+BIN="${BUILD}/bin"
 DIR="${SRC}/hamon"
 
 TESTS="$(pwd)/tests"
-TESTS_OUT="${TESTS}/out"
-TESTS_BIN="${TESTS}/bin"
+TESTS_OUT="${BUILD}/tests/out"
+TESTS_BIN="${BUILD}/tests/bin"
+
+UNITY_TAG="v2.6.0"
 
 #INCLUDE="$(pwd)/include"
 COLOR=true
@@ -69,7 +72,7 @@ if ${COLOR}; then
 	CLEAR="${ESCAPE}[0m"
 fi
 
-CFLAGS="-O3 -Wall -Wextra"
+CFLAGS="-O3 -Wall -Wextra -I./"
 
 LINKER_FLAGS="-Wall -Wextra"
 
@@ -125,6 +128,12 @@ Cleans all files in ${CYAN}${BIN}/${CLEAR} & ${CYAN}${OUT}/${CLEAR}
 ${RED}-vg${CLEAR} | ${RED}--delete-cores${CLEAR} | ${RED}--delete-vgcores${CLEAR} | ${RED}--clean-vgcores${CLEAR} | ${RED}--clean-cores${CLEAR}
 Cleans all vgcore files generated by valgrind in the repo.
 
+${RED}-h${CLEAR} | ${RED}--help${CLEAR}
+Shows this message.
+
+${RED}-f${CLEAR} | ${RED}--fix-clangd${CLEAR}
+Generates a compile_commands.json for clangd.
+
 Made with ${RED}<3${CLEAR} by ${__AUTHOR__}
 EOF
 }
@@ -218,9 +227,9 @@ setup_unity() {
 	mkdir temp_dir
 
 	pushd temp_dir >/dev/null || handle_failure "Failed to pushd"
-	git clone https://github.com/ThrowTheSwitch/Unity
+	git clone --branch "${UNITY_TAG}" https://github.com/ThrowTheSwitch/Unity
 
-	rm Unity/src/meson.buildhttps://crackboard.dev/
+	rm Unity/src/meson.build
 	mv Unity/src/* "${TESTS}/unity"
 
 	popd >/dev/null || handle_failure "Failed to popd"
@@ -249,19 +258,19 @@ unit_test() {
 	fi
 
 	if [[ ! -d ${TESTS_OUT} ]]; then
-		mkdir "${TESTS_OUT}"
+		mkdir -p "${TESTS_OUT}"
 	fi
 
 	if [[ ! -d ${TESTS_OUT}/unity ]]; then
-		mkdir "${TESTS_OUT}/unity"
+		mkdir -p "${TESTS_OUT}/unity"
 	fi
 
 	if [[ ! -d ${TESTS_OUT}/deps ]]; then
-		mkdir "${TESTS_OUT}/deps"
+		mkdir -p "${TESTS_OUT}/deps"
 	fi
 
 	if [[ ! -d ${TESTS_BIN} ]]; then
-		mkdir "${TESTS_BIN}"
+		mkdir -p "${TESTS_BIN}"
 	fi
 
 	mapfile -t TEST_FILES < <(find "${TESTS}" -maxdepth 1 -type f -name "*.c")
@@ -336,7 +345,7 @@ unit_test() {
 
 	popd >/dev/null || handle_failure "Failed to popd" # || echo "Failed to popd" && exit 1
 
-	rm -fr "${TESTS_OUT}" "${TESTS_BIN}"
+	#rm -fr "${TESTS_OUT}" "${TESTS_BIN}"
 }
 
 # removes dangling object files that shouldn't be there, used to be required, not that much as of lately though.
@@ -420,6 +429,12 @@ clear_vgcores() {
 	done
 }
 
+fix_clangd() {
+	cmake -Bbuild -DCMAKE_EXPORT_COMPILE_COMMANDS=ON >/dev/null
+	mv build/compile_commands.json .
+	find build -mindepth 1 ! -path "build/bin" ! -path "build/out" ! -path "build/tests" ! -name "build.sh" -exec rm -rf {} +
+}
+
 case $1 in
 "-c" | "--compile")
 	compile
@@ -440,7 +455,10 @@ case $1 in
 "-vg" | "--delete-cores" | "--delete-vgcores" | "--clean-vgcores" | "--clean-cores")
 	clear_vgcores
 	;;
-"--help" | "-h" | "-?" | *)
+"-f" | "--fix-clangd")
+	fix_clangd
+	;;
+"--help" | "-h" | *)
 	print_help "${@}"
 	;;
 esac