diff --git a/.env.in b/.env.in index 957b1fb2..c118cccd 100644 --- a/.env.in +++ b/.env.in @@ -27,6 +27,6 @@ DOCKER_GID=${DOCKER_GID} DOCKER_DOCKER_PUSHRM_DIGEST=@sha256:812a950e5be7dca26cef33b61eb2076bfcfb6c2a8ec96c126371fc049c3b6608 DOCKER_GITLAB_RELEASE_CLI_DIGEST=@sha256:696013aea0f2a20482800ce3a77341f840d7c7ec17bd78bd555e0bd6c00e4f11 DOCKER_HADOLINT_DIGEST=@sha256:9cef74a390694cdc01dd119cbba9adac5bb6671ce67d8d79eb7ec68f497a3684 -DOCKER_PANDOC_DIGEST=@sha256:336f9e79cb3132fa6ff4a497f0953a7e5b71592c16472b7c960eb774dcea9a14 +DOCKER_PANDOC_DIGEST=@sha256:108fa6ae7c872fad83064c8b3841dab27b2634496acca14ef95c57694da6de52 DOCKER_REUSE_DIGEST=@sha256:a0dca4eb014908af80608c06de3470b770a9c97f91041777d0c1cfbfeb8709f7 -DOCKER_VALE_DIGEST=@sha256:da6a0901858421b282aa8d935e72831c84cebf716ae4e276658e9e5d382fad20 +DOCKER_VALE_DIGEST=@sha256:5e15a69cf0590ad03b275cb406156092977af7a11a7bde3b78375c14d907907f diff --git a/Makefile b/Makefile index a5130065..d344ecc7 100644 --- a/Makefile +++ b/Makefile @@ -836,7 +836,7 @@ devel-upgrade: touch ./requirements/*.txt.in "./.env.in.~prereq~" "./.vale.ini" ./styles/*.ini $(MAKE) PIP_COMPILE_ARGS="--upgrade" DOCKER_COMPOSE_UPGRADE=true \ "./requirements/$(PYTHON_HOST_ENV)/build.txt" devel-upgrade-pre-commit \ - devel-upgrade-js "./var/log/vale-rule-levels.log" + devel-upgrade-js "./.env.~out~" "./var/log/vale-rule-levels.log" .PHONY: devel-upgrade-pre-commit ## Update VCS integration from remotes to the most recent tag. devel-upgrade-pre-commit: ./.tox/build/.tox-info.json diff --git a/build-host/Dockerfile b/build-host/Dockerfile index 41c8ce04..7d77e5d7 100644 --- a/build-host/Dockerfile +++ b/build-host/Dockerfile @@ -52,8 +52,8 @@ RUN --mount=type=cache,target=/root/.cache,sharing=locked \ pipx install "tox==4.11.3" && \ wget -qO- "https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh" | \ bash && \ - echo 'nvm_get_arch() { nvm_echo x64-musl; }' >>"${HOME}/.nvm/nvm.sh" && \ - . "${HOME}/.nvm/nvm.sh" || true && \ + echo 'nvm_get_arch() { nvm_echo x64-musl; }' >>"${HOME}/.nvm/nvm.sh" && set +u && \ + . "${HOME}/.nvm/nvm.sh" || true && set -u && \ nvm install "20" # Layers that don't vary between projects next: diff --git a/newsfragments/+upgrade-requirements.bugfix.rst b/newsfragments/+upgrade-requirements.bugfix.rst index 4f286dee..836a31fd 100644 --- a/newsfragments/+upgrade-requirements.bugfix.rst +++ b/newsfragments/+upgrade-requirements.bugfix.rst @@ -1,2 +1,2 @@ :Upgrade: Upgrade all requirements to the most recent versions as of - Wed Jun 12 08:33:52 PM UTC 2024. + Wed Jun 12 10:43:46 PM UTC 2024.