renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-10 05:56:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'main' of https://github.com/renovatebot/renovate into fix-auto-merge-if-plus-one

Browse source
This commit is contained in:
Felipe Santos 2024-12-02 17:36:43 +00:00
commit b1ce02b44b
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/data/monorepo.json
View file

@ -540,6 +540,7 @@
"unhead": "https://github.com/unjs/unhead", "unhead": "https://github.com/unjs/unhead",
"unocss": "https://github.com/unocss/unocss", "unocss": "https://github.com/unocss/unocss",
"uppy": "https://github.com/transloadit/uppy", "uppy": "https://github.com/transloadit/uppy",
"vaadin-hilla": "https://github.com/vaadin/hilla",
"vaadinWebComponents": "https://github.com/vaadin/web-components", "vaadinWebComponents": "https://github.com/vaadin/web-components",
"visx": "https://github.com/airbnb/visx", "visx": "https://github.com/airbnb/visx",
"vitest": "https://github.com/vitest-dev/vitest", "vitest": "https://github.com/vitest-dev/vitest",

10
lib/workers/global/index.ts
View file

@ -96,10 +96,11 @@ export async function validatePresets(config: AllConfig): Promise<void> {
export async function resolveGlobalExtends( export async function resolveGlobalExtends(
globalExtends: string[], globalExtends: string[],
ignorePresets?: string[],
): Promise<AllConfig> { ): Promise<AllConfig> {
try { try {
// Make a "fake" config to pass to resolveConfigPresets and resolve globalPresets // Make a "fake" config to pass to resolveConfigPresets and resolve globalPresets
const config = { extends: globalExtends }; const config = { extends: globalExtends, ignorePresets };
const resolvedConfig = await resolveConfigPresets(config); const resolvedConfig = await resolveConfigPresets(config);
return resolvedConfig; return resolvedConfig;
} catch (err) { } catch (err) {
@ -133,10 +134,13 @@ export async function start(): Promise<number> {
await instrument('config', async () => { await instrument('config', async () => {
// read global config from file, env and cli args // read global config from file, env and cli args
config = await getGlobalConfig(); config = await getGlobalConfig();
if (config?.globalExtends) { if (is.nonEmptyArray(config?.globalExtends)) {
// resolve global presets immediately // resolve global presets immediately
config = mergeChildConfig( config = mergeChildConfig(
await resolveGlobalExtends(config.globalExtends), await resolveGlobalExtends(
config.globalExtends,
config.ignorePresets,
),
config, config,
); );
} }

6
tools/docker/Dockerfile
View file

@ -5,19 +5,19 @@ ARG BASE_IMAGE_TYPE=slim
# -------------------------------------- # --------------------------------------
# slim image # slim image
# -------------------------------------- # --------------------------------------
FROM ghcr.io/renovatebot/base-image:9.11.4@sha256:918219550acbe6663093c1f667b155de7c088f20cf3f672dfc37e974bc29c5a6 AS slim-base FROM ghcr.io/renovatebot/base-image:9.11.5@sha256:7a04fa09dbe0da999e9f2e0500ad38972566ecbc1408fde8c6cbd5ca119df735 AS slim-base
# -------------------------------------- # --------------------------------------
# full image # full image
# -------------------------------------- # --------------------------------------
FROM ghcr.io/renovatebot/base-image:9.11.4-full@sha256:9a223db5b6f8106787028fcf1edfe98507089729ee7edbde0ced57909b0103e3 AS full-base FROM ghcr.io/renovatebot/base-image:9.11.5-full@sha256:b244d0f1641b796c3e3aaffbaaa535dbb2c2258806367805e40ff182b0962888 AS full-base
ENV RENOVATE_BINARY_SOURCE=global ENV RENOVATE_BINARY_SOURCE=global
# -------------------------------------- # --------------------------------------
# build image # build image
# -------------------------------------- # --------------------------------------
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.11.4@sha256:918219550acbe6663093c1f667b155de7c088f20cf3f672dfc37e974bc29c5a6 AS build FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.11.5@sha256:7a04fa09dbe0da999e9f2e0500ad38972566ecbc1408fde8c6cbd5ca119df735 AS build
# We want a specific node version here # We want a specific node version here
# renovate: datasource=node-version # renovate: datasource=node-version