diff --git a/.ci/image/Dockerfile b/.ci/image/Dockerfile index b995065..f115929 100644 --- a/.ci/image/Dockerfile +++ b/.ci/image/Dockerfile @@ -1,7 +1,6 @@ # https://jake-shadle.github.io/xwin/ -FROM debian:bullseye-slim AS xwin +FROM debian:bullseye-slim as xwin -# renovate: datasource=github-releases depName=xwin packageName=Jake-Shadle/xwin ARG XWIN_VERSION=0.5.2 ARG XWIN_PREFIX="xwin-$XWIN_VERSION-x86_64-unknown-linux-musl" ADD https://github.com/Jake-Shadle/xwin/releases/download/$XWIN_VERSION/$XWIN_PREFIX.tar.gz /root/$XWIN_PREFIX.tar.gz @@ -32,7 +31,7 @@ RUN set -eux; \ # And to keep that to a minimum, we still delete the stuff we don't need. rm -rf /root/.xwin-cache; -FROM rust:slim-bullseye AS linux +FROM rust:slim-bullseye as linux RUN set -eux; \ apt-get update; \ @@ -59,9 +58,8 @@ WORKDIR /src/dtmt COPY lib/oodle/*.so lib/oodle/*.a /src/ -FROM linux AS msvc +FROM linux as msvc -# renovate: datasource=github-releases depName=llvm packageName=llvm/llvm-project ARG LLVM_VERSION=18 ENV KEYRINGS /usr/local/share/keyrings diff --git a/.renovaterc b/.renovaterc index 6d8dec6..7ad59cd 100644 --- a/.renovaterc +++ b/.renovaterc @@ -10,35 +10,5 @@ "baseBranches": [ "$default", "/^release\\/.*/" - ], - "ignorePaths": [ - "lib/color_eyre/**", - "lib/ansi-parser/**", - "lib/luajit2-sys/**", - "**/target/**" - ], - "customManagers": [ - { - "customType": "regex", - "description": "Update _VERSION variables in Dockerfiles", - "fileMatch": [ - "(^|/|\\.)Dockerfile$", - "(^|/)Dockerfile\\.[^/]*$" - ], - "matchStrings": [ - "# renovate: datasource=(?[a-z-]+?)(?: depName=(?.+?))? packageName=(?.+?)(?: versioning=(?[a-z-]+?))?\\s(?:ENV|ARG) .+?_VERSION=(?.+?)\\s" - ] - } - ], - "packageRules": [ - { - "matchDatasources": [ - "github-releases" - ], - "matchPackageNames": [ - "llvm/llvm-project" - ], - "extractVersion": "^llvmorg-(?\\d+)\\.\\d+\\.\\d+$" - } ] } diff --git a/crates/dtmt/src/main.rs b/crates/dtmt/src/main.rs index ef3d36b..e2cb718 100644 --- a/crates/dtmt/src/main.rs +++ b/crates/dtmt/src/main.rs @@ -1,6 +1,5 @@ #![feature(io_error_more)] #![feature(let_chains)] -#![feature(result_flattening)] #![feature(test)] #![windows_subsystem = "console"]