thepigeongenerator/mcaselector-lite
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/mcaselector-lite.git synced 2025-12-18 11:35:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: thepigeongenerator:1140bd97bf8624116acaddc64816479b6bd96516
Branches Tags
thepigeongenerator:main
...
compare: thepigeongenerator:f5450232b43e7f2474f8f2f90f7b42f9a3037be3
Branches Tags
thepigeongenerator:main

7 Commits
1140bd97bf ... f5450232b4

Author SHA1 Message Date
Quinn
f5450232b4 fix: testing compilation does not correctly filter out main.o 2025-09-15 09:56:08 +02:00
Quinn
9f7d1fb57c fix: fminf and other <math.h> from libm not found. 
The `-lm` linker flag was applied preceding the libraries, but it
should've been succeding.
 2025-09-15 09:55:48 +02:00
Quinn
2186ec2942 forcibly recompile the libs, so if deps get updated, this will be carried through. 
This sacrifices a bit of workflow performance, but won't be too
significant. The heaviest step (cmake) is still circumvented
 2025-09-15 09:40:31 +02:00
Quinn
1ac4592503 Aparrently, the act docker container does not have cmake installed. 
Adding this should not make a significant impact on workflow
performance.
 2025-09-15 09:35:59 +02:00
Quinn
4da02373a5 disable fail fast, so feedback is provided for all matrix combinations 2025-09-15 09:25:18 +02:00
Quinn
c724ff0449 remove explicit definition for repository, since it messes with act 
`act` allows to debug github workflows before sending them to the
server, allowing to test some behaviour, before pushing.
 2025-09-15 09:20:07 +02:00
Quinn
348c4e484c fix: clean-libs can fail when it shouldn't 2025-09-13 21:44:46 +02:00
2 changed files with 6 additions and 6 deletions
Expand all files Collapse all files

6
.github/workflows/ci.yaml vendored
View File

@@ -6,6 +6,7 @@ on:
jobs: jobs:
compile-and-test: compile-and-test:
strategy: strategy:
fail-fast: false # disable fail fast, so feedback is provided for all matrix combinations
matrix: matrix:
os: os:
- ubuntu-latest - ubuntu-latest
@@ -17,7 +18,6 @@ jobs:
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
with: with:
repository: ${{github.repository}}
submodules: true submodules: true
fetch-depth: 1 fetch-depth: 1
@@ -25,13 +25,13 @@ jobs:
if: runner.os == 'Linux' if: runner.os == 'Linux'
run: | run: |
sudo apt update sudo apt update
sudo apt install -y libwayland-dev libxkbcommon-dev xorg-dev sudo apt install -y libwayland-dev libxkbcommon-dev xorg-dev cmake
- uses: actions/cache@v4 - uses: actions/cache@v4
with: with:
path: lib/obj/ path: lib/obj/
key: ${{runner.os}}-lib/obj-${{github.sha}} key: ${{runner.os}}-lib/obj-${{github.sha}}
restore-keys: ${{runner.os}}-lib/obj- restore-keys: ${{runner.os}}-lib/obj-
- run: make -j libs - run: make -j libs -B
- run: make -j all - run: make -j all
- run: make -j test - run: make -j test

6
Makefile
View File

@@ -24,7 +24,7 @@ LDFLAGS += -fsanitize=address -ftrapv
endif endif
CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive CPPFLAGS += -Iinclude -Ilib/glad/include -Ilib/glfw/include -Ilib/libarchive/libarchive
LDFLAGS += -Llib/obj/glfw/src -Llib/obj/libarchive/libarchive LDFLAGS += -Llib/obj/glfw/src -Llib/obj/libarchive/libarchive
LDLIBS += -lm -lglfw3 -larchive LDLIBS += -lglfw3 -larchive -lm
# detect if we're compiling on Windows, meaning # detect if we're compiling on Windows, meaning
# a lot of things considered "standard" are unavailable. # a lot of things considered "standard" are unavailable.
@@ -52,7 +52,7 @@ clean:
@[ -d bin/ ] && rm -vr bin/ || true @[ -d bin/ ] && rm -vr bin/ || true
@[ -d obj/ ] && rm -vr obj/ || true @[ -d obj/ ] && rm -vr obj/ || true
clean-libs: clean-libs:
@[ -d lib/obj/ ] && rm -vr lib/obj/ @[ -d lib/obj/ ] && rm -vr lib/obj/ || true
# compiles the libraries using cmake # compiles the libraries using cmake
@@ -67,7 +67,7 @@ bin/$(NAME): $(OBJ)
@$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) @$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)
# link together a testing binary # link together a testing binary
bin/TEST_$(NAME): $(TOBJ) $(filter-out main.o,$(OBJ)) bin/TEST_$(NAME): $(TOBJ) $(filter-out obj/src/main.o,$(OBJ))
$(info [CC/LD] $@) $(info [CC/LD] $@)
@mkdir -p $(@D) @mkdir -p $(@D)
@$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS) @$(CC) -o $@ $^ $(LDFLAGS) $(LDLIBS)