Skip to content

CI fixes. #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 8, 2025
Merged

CI fixes. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1f23f3
Make: fix host tuple detection with older Rust versions.
bavshin-f5 Aug 8, 2025
72dff38
CI: fix dependabot versioning strategy.
bavshin-f5 Aug 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .github/dependabot.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ updates:
schedule:
interval: "cron"
cronjob: "1 2 1,15 * *"
versioning-strategy: "increase-if-necessary"
# We want "increase-if-neccessary", but it's not supported for cargo.
# See dependabot/dependabot-core#4009
versioning-strategy: "lockfile-only"
2 changes: 0 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ MODULE = nginx_acme
BUILD ?= debug
TESTS ?= t/
NGX_CARGO ?= cargo
# will be used to print host-tuple
NGX_RUSTC ?= rustc

NGINX_CONFIGURE_BASE = \
auto/configure \
Expand Down
2 changes: 1 addition & 1 deletion build/compat-gnu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HOST_TUPLE := $(shell $(NGX_RUSTC) --print=host-tuple)
HOST_TUPLE := $(shell $(NGX_CARGO) -vV | awk '/^host: / { print $$2; }')

# extension for Rust cdylib targets
ifeq ($(shell uname), Darwin)
Expand Down
2 changes: 1 addition & 1 deletion build/compat-posix.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
HOST_TUPLE != $(NGX_RUSTC) --print=host-tuple
HOST_TUPLE != $(NGX_CARGO) -vV | awk '/^host: / { print $$2; }'

# bsd make compatibility
CURDIR ?= $(.CURDIR)
Expand Down
Loading