From 67ce60faf9876d6c6f28f53514e7a45395d327e3 Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:25:17 +1100 Subject: use make in ci action --- .github/workflows/continuous-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/continuous-workflow.yml b/.github/workflows/continuous-workflow.yml index f9a3f53..1b5c8ce 100644 --- a/.github/workflows/continuous-workflow.yml +++ b/.github/workflows/continuous-workflow.yml @@ -18,4 +18,4 @@ jobs: - name: Check formatting run: find src/ -iname *.h -o -iname *.c | xargs clang-format --style=file --dry-run --Werror - name: Compile C code - run: xmake build -y + run: make -- cgit v1.2.3-70-g09d2 From 5a5d2ee4dd757ec7a5fadb75ac629a5e628bb831 Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:27:22 +1100 Subject: remove xmake dep --- .github/workflows/continuous-workflow.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to '.github') diff --git a/.github/workflows/continuous-workflow.yml b/.github/workflows/continuous-workflow.yml index 1b5c8ce..f8bfa86 100644 --- a/.github/workflows/continuous-workflow.yml +++ b/.github/workflows/continuous-workflow.yml @@ -5,11 +5,10 @@ jobs: Compile-and-Test: runs-on: ubuntu-latest steps: - - name: Install system dependencies, xmake, etc + - name: Install system dependencies, make, etc run: | - sudo add-apt-repository ppa:xmake-io/xmake sudo apt update - sudo apt install -y xmake xorg-dev libglu1-mesa-dev clang-format + sudo apt install -y xorg-dev libglu1-mesa-dev clang-format make - name: Check out repository code uses: actions/checkout@v4 - name: List files in the repository -- cgit v1.2.3-70-g09d2 From 6d0cf58f998d6e2888cac2c628fcddba4a60d9f2 Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:29:11 +1100 Subject: add format-check make target --- .github/workflows/continuous-workflow.yml | 2 +- Makefile | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to '.github') diff --git a/.github/workflows/continuous-workflow.yml b/.github/workflows/continuous-workflow.yml index f8bfa86..ba204ef 100644 --- a/.github/workflows/continuous-workflow.yml +++ b/.github/workflows/continuous-workflow.yml @@ -15,6 +15,6 @@ jobs: run: | ls ${{ github.workspace }} - name: Check formatting - run: find src/ -iname *.h -o -iname *.c | xargs clang-format --style=file --dry-run --Werror + run: make format-check - name: Compile C code run: make diff --git a/Makefile b/Makefile index afa79ed..8dc73e2 100644 --- a/Makefile +++ b/Makefile @@ -92,10 +92,18 @@ cube: $(EXAMPLES_DIR)/cube.c $(SHARED_LIB) $(SHADER_OUT_DIR)/cube.air $(METAL_LI format: clang-format -i $(FORMAT_FILES) -.PHONY: tidy +.PHONY: format-check +format-check: + clang-format --dry-run -Werror $(FORMAT_FILES) + +.PHONY: tidy-fix tidy: clang-tidy -fix $(SRCS) $(EXAMPLES_DIR)/*.c -- $(CFLAGS) +.PHONY: tidy-check +tidy-check: + clang-tidy $(SRCS) $(EXAMPLES_DIR)/*.c -- $(CFLAGS) + .PHONY: clean clean: rm -rf $(BUILD_DIR) -- cgit v1.2.3-70-g09d2 From 6632e63fd6acdba8138b3232ef2a87bedfedab81 Mon Sep 17 00:00:00 2001 From: omniscient <17525998+omnisci3nce@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:31:52 +1100 Subject: add glfw to ci deps --- .github/workflows/continuous-workflow.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.github') diff --git a/.github/workflows/continuous-workflow.yml b/.github/workflows/continuous-workflow.yml index ba204ef..b6c381b 100644 --- a/.github/workflows/continuous-workflow.yml +++ b/.github/workflows/continuous-workflow.yml @@ -8,7 +8,7 @@ jobs: - name: Install system dependencies, make, etc run: | sudo apt update - sudo apt install -y xorg-dev libglu1-mesa-dev clang-format make + sudo apt install -y xorg-dev libglfw3-dev libglu1-mesa-dev clang-format make - name: Check out repository code uses: actions/checkout@v4 - name: List files in the repository -- cgit v1.2.3-70-g09d2