diff --git a/.github/dependabot.yml b/.github/dependabot.yml index da5371e..3e9e75e 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -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" diff --git a/Makefile b/Makefile index a7bb398..e34dd1c 100644 --- a/Makefile +++ b/Makefile @@ -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 \ diff --git a/build/compat-gnu.mk b/build/compat-gnu.mk index d2e3eb0..2364e0f 100644 --- a/build/compat-gnu.mk +++ b/build/compat-gnu.mk @@ -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) diff --git a/build/compat-posix.mk b/build/compat-posix.mk index 884e7ea..f3af3a6 100644 --- a/build/compat-posix.mk +++ b/build/compat-posix.mk @@ -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)