diff --git a/.github/workflows/verify.yml b/.github/workflows/verify.yml index fbd83c2..2410bfe 100644 --- a/.github/workflows/verify.yml +++ b/.github/workflows/verify.yml @@ -27,6 +27,7 @@ jobs: container: sfja/h5-mst-ci:latest steps: - uses: actions/checkout@v6 + - run: rustup default stable - name: Check working-directory: ./game run: cargo check diff --git a/backend/Makefile b/backend/Makefile index 86c0399..ed7f491 100644 --- a/backend/Makefile +++ b/backend/Makefile @@ -9,8 +9,8 @@ LDFLAGS = libraries = libmosquitto -CXXFLAGS += $(shell pkg-config $(libraries) --cflags) -LDFLAGS += $(shell pkg-config $(libraries) --libs) +CXXFLAGS += $(shell pkgconf $(libraries) --cflags --exists) +LDFLAGS += $(shell pkgconf $(libraries) --libs --exists) RELEASE = 0 GDB = 0 @@ -52,7 +52,7 @@ test_targets = $(test_sources:$(test_dir)/%.cpp=$(build_dir)/$(test_dir)/test_%) all: $(target) $(test_targets) $(target): $(objects) - $(LD) -o $@ $(CXXFLAGS) $(LDFLAGS) $^ + $(LD) -o $@ $(CXXFLAGS) $^ $(LDFLAGS) $(obj_dir)/%.o:%.cpp @mkdir -p $(dir $@) diff --git a/ci-container/Dockerfile b/ci-container/Dockerfile index 3360e50..f9636fb 100644 --- a/ci-container/Dockerfile +++ b/ci-container/Dockerfile @@ -1,7 +1,8 @@ FROM alpine:edge 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 -ENV PATH="/root/.cargo/bin:${PATH}" -RUN rustup default stable +RUN curl https://sh.rustup.rs -sSf \ + | sh -s -- --default-toolchain stable -y + +ENV PATH="/root/.cargo/bin:${PATH}"