From 0ed676d79b12ef19845b885188f79ad55b300592 Mon Sep 17 00:00:00 2001 From: Kayne Ruse Date: Tue, 13 Aug 2024 23:48:21 +1000 Subject: [PATCH] Added windows-latest build to CI --- .github/workflows/continuous-integration-v2.yml | 11 ++++++++++- makefile | 7 ++++--- tests/makefile | 7 ++++--- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.github/workflows/continuous-integration-v2.yml b/.github/workflows/continuous-integration-v2.yml index 401fce3..fa4bb41 100644 --- a/.github/workflows/continuous-integration-v2.yml +++ b/.github/workflows/continuous-integration-v2.yml @@ -21,5 +21,14 @@ jobs: steps: - uses: actions/checkout@v4 - - name: make tests + - name: make tests (ubuntu) run: make tests + + test-windows-latest: + runs-on: windows-latest + + steps: + - uses: actions/checkout@v4 + - name: make tests (windows) + run: make tests + diff --git a/makefile b/makefile index 8719eb0..da5efd1 100644 --- a/makefile +++ b/makefile @@ -1,4 +1,5 @@ #compiler settings +CC=gcc CFLAGS+=-std=c17 -pedantic -Werror LIBS=-lm @@ -42,9 +43,9 @@ ifeq ($(shell uname),Linux) find . -type d -name 'out' -delete find . -type d -name 'obj' -delete else ifeq ($(OS),Windows_NT) - del *.o *.a *.exe *.dll *.lib *.so *.dylib - del /s out - del /s obj + $(RM) *.o *.a *.exe *.dll *.lib *.so *.dylib + $(RM) out + $(RM) obj else ifeq ($(shell uname),Darwin) find . -type f -name '*.o' -delete find . -type f -name '*.a' -delete diff --git a/tests/makefile b/tests/makefile index f0fe789..6a61a57 100644 --- a/tests/makefile +++ b/tests/makefile @@ -1,4 +1,5 @@ #compiler settings +CC=gcc CFLAGS=-g -Wall -Werror -Wno-unused-parameter -Wno-unused-function -Wno-unused-variable LIBS=-lm @@ -57,9 +58,9 @@ ifeq ($(shell uname),Linux) find . -type d -name 'out' -delete find . -type d -name 'obj' -delete else ifeq ($(OS),Windows_NT) - del *.o *.a *.exe *.dll *.lib *.so *.dylib - del /s out - del /s obj + $(RM) *.o *.a *.exe *.dll *.lib *.so *.dylib + $(RM) out + $(RM) obj else ifeq ($(shell uname),Darwin) find . -type f -name '*.o' -delete find . -type f -name '*.a' -delete