fix pipelines

This commit is contained in:
sfja 2026-03-28 14:48:12 +01:00
parent e8f78fdd25
commit e390537e06
3 changed files with 8 additions and 6 deletions

View File

@ -27,6 +27,7 @@ jobs:
container: sfja/h5-mst-ci:latest container: sfja/h5-mst-ci:latest
steps: steps:
- uses: actions/checkout@v6 - uses: actions/checkout@v6
- run: rustup default stable
- name: Check - name: Check
working-directory: ./game working-directory: ./game
run: cargo check run: cargo check

View File

@ -9,8 +9,8 @@ LDFLAGS =
libraries = libmosquitto libraries = libmosquitto
CXXFLAGS += $(shell pkg-config $(libraries) --cflags) CXXFLAGS += $(shell pkgconf $(libraries) --cflags --exists)
LDFLAGS += $(shell pkg-config $(libraries) --libs) LDFLAGS += $(shell pkgconf $(libraries) --libs --exists)
RELEASE = 0 RELEASE = 0
GDB = 0 GDB = 0
@ -52,7 +52,7 @@ test_targets = $(test_sources:$(test_dir)/%.cpp=$(build_dir)/$(test_dir)/test_%)
all: $(target) $(test_targets) all: $(target) $(test_targets)
$(target): $(objects) $(target): $(objects)
$(LD) -o $@ $(CXXFLAGS) $(LDFLAGS) $^ $(LD) -o $@ $(CXXFLAGS) $^ $(LDFLAGS)
$(obj_dir)/%.o:%.cpp $(obj_dir)/%.o:%.cpp
@mkdir -p $(dir $@) @mkdir -p $(dir $@)

View File

@ -1,7 +1,8 @@
FROM alpine:edge FROM alpine:edge
RUN apk add --no-cache curl build-base clang22-extra-tools mosquitto-dev sdl3-dev RUN apk add --no-cache curl build-base clang22-extra-tools mosquitto-dev sdl3-dev
RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN curl https://sh.rustup.rs -sSf \
ENV PATH="/root/.cargo/bin:${PATH}" | sh -s -- --default-toolchain stable -y
RUN rustup default stable
ENV PATH="/root/.cargo/bin:${PATH}"