Skip to content

Commit

Permalink
Merge branch 'main' into feat/datasource-release-interception
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov authored Sep 16, 2024
2 parents a545bc5 + 71f64a1 commit 98eaddb
Show file tree
Hide file tree
Showing 37 changed files with 1,102 additions and 856 deletions.
2 changes: 1 addition & 1 deletion .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
FROM ghcr.io/containerbase/devcontainer:11.11.14
FROM ghcr.io/containerbase/devcontainer:11.11.17
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ jobs:
show-progress: false

- name: docker-config
uses: containerbase/internal-tools@7967a205f4acf76ad2d414d6a074b58a52739986 # v3.4.15
uses: containerbase/internal-tools@b6d2b362cb282e8088211f792cc2211529936635 # v3.4.17
with:
command: docker-config

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/init@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
with:
languages: javascript

Expand All @@ -51,7 +51,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/autobuild@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -65,4 +65,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/analyze@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
2 changes: 1 addition & 1 deletion .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
format: 'sarif'
output: 'trivy-results.sarif'

- uses: github/codeql-action/upload-sarif@4dd16135b69a43b6c8efb853346f8437d92d3c93 # v3.26.6
- uses: github/codeql-action/upload-sarif@8214744c546c1e5c8f03dde8fab3a7353211988d # v3.26.7
with:
sarif_file: trivy-results.sarif
category: 'docker-image-${{ matrix.tag }}'
4 changes: 2 additions & 2 deletions docs/usage/docker.md
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ Renovate will get the credentials with the [`google-auth-library`](https://www.n
service_account: ${{ env.SERVICE_ACCOUNT }}

- name: renovate
uses: renovatebot/[email protected].8
uses: renovatebot/[email protected].9
env:
RENOVATE_HOST_RULES: |
[
Expand Down Expand Up @@ -478,7 +478,7 @@ Make sure to install the Google Cloud SDK into the custom image, as you need the
For example:

```Dockerfile
FROM renovate/renovate:38.72.1
FROM renovate/renovate:38.80.0
# Include the "Docker tip" which you can find here https://cloud.google.com/sdk/docs/install
# under "Installation" for "Debian/Ubuntu"
RUN ...
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/examples/opentelemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ version: '3'
services:
# Jaeger
jaeger:
image: jaegertracing/all-in-one:1.60.0
image: jaegertracing/all-in-one:1.61.0
ports:
- '16686:16686'
- '4317'
Expand Down
10 changes: 5 additions & 5 deletions docs/usage/examples/self-hosting.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ It builds `latest` based on the `main` branch and all SemVer tags are published
```sh title="Example of valid tags"
docker run --rm renovate/renovate
docker run --rm renovate/renovate:38
docker run --rm renovate/renovate:38.72
docker run --rm renovate/renovate:38.72.1
docker run --rm renovate/renovate:38.80
docker run --rm renovate/renovate:38.80.0
```

<!-- prettier-ignore -->
Expand Down Expand Up @@ -62,7 +62,7 @@ spec:
- name: renovate
# Update this to the latest available and then enable Renovate on
# the manifest
image: renovate/renovate:38.72.1
image: renovate/renovate:38.80.0
args:
- user/repo
# Environment Variables
Expand Down Expand Up @@ -121,7 +121,7 @@ spec:
template:
spec:
containers:
- image: renovate/renovate:38.72.1
- image: renovate/renovate:38.80.0
name: renovate-bot
env: # For illustration purposes, please use secrets.
- name: RENOVATE_PLATFORM
Expand Down Expand Up @@ -367,7 +367,7 @@ spec:
containers:
- name: renovate
# Update this to the latest available and then enable Renovate on the manifest
image: renovate/renovate:38.72.1
image: renovate/renovate:38.80.0
volumeMounts:
- name: ssh-key-volume
readOnly: true
Expand Down
7 changes: 4 additions & 3 deletions docs/usage/self-hosted-configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -1172,10 +1172,11 @@ If set, Renovate will use this string as the `endpoint` when creating the AWS S3
If set, Renovate will enable `forcePathStyle` when creating the AWS S3 client instance.

For example:
| `s3PathStyle` | Path |

| `s3PathStyle` | Path |
| ------------- | ---------------------------------- |
| `off` | `https://bucket.s3.amazonaws.com/` |
| `on` | `https://s3.amazonaws.com/bucket/` |
| `off` | `https://bucket.s3.amazonaws.com/` |
| `on` | `https://s3.amazonaws.com/bucket/` |

Read the [AWS S3 docs, Interface BucketEndpointInputConfig](https://docs.aws.amazon.com/AWSJavaScriptSDK/v3/latest/clients/client-s3/interfaces/bucketendpointinputconfig.html) to learn more about path-style URLs.

Expand Down
2 changes: 1 addition & 1 deletion lib/config/options/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ const options: RenovateOptions[] = [
description:
'Change this value to override the default Renovate sidecar image.',
type: 'string',
default: 'ghcr.io/containerbase/sidecar:11.11.14',
default: 'ghcr.io/containerbase/sidecar:11.11.17',
globalOnly: true,
},
{
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/gitea/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export function getPresetFromEndpoint(
filePreset: string,
presetPath?: string,
endpoint = Endpoint,
tag?: string | undefined,
tag?: string,
): Promise<Preset | undefined> {
return fetchPreset({
repo,
Expand Down
4 changes: 2 additions & 2 deletions lib/config/presets/github/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export async function fetchJSONFile(
repo: string,
fileName: string,
endpoint: string,
tag?: string | undefined,
tag?: string,
): Promise<Preset> {
let ref = '';
if (is.nonEmptyString(tag)) {
Expand Down Expand Up @@ -42,7 +42,7 @@ export function getPresetFromEndpoint(
filePreset: string,
presetPath?: string,
endpoint = Endpoint,
tag?: string | undefined,
tag?: string,
): Promise<Preset | undefined> {
return fetchPreset({
repo,
Expand Down
4 changes: 2 additions & 2 deletions lib/config/presets/gitlab/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export async function fetchJSONFile(
repo: string,
fileName: string,
endpoint: string,
tag?: string | undefined,
tag?: string,
): Promise<Preset> {
let url = endpoint;
let ref = '';
Expand Down Expand Up @@ -60,7 +60,7 @@ export function getPresetFromEndpoint(
presetName: string,
presetPath?: string,
endpoint = Endpoint,
tag?: string | undefined,
tag?: string,
): Promise<Preset | undefined> {
return fetchPreset({
repo,
Expand Down
11 changes: 10 additions & 1 deletion lib/config/presets/internal/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ export const presets: Record<string, Preset> = {
},
ignoreModulesAndTests: {
description:
'Ignore `node_modules`, `bower_components`, `vendor` and various test/tests directories.',
'Ignore `node_modules`, `bower_components`, `vendor` and various test/tests (except for nuget) directories.',
ignorePaths: [
'**/node_modules/**',
'**/bower_components/**',
Expand All @@ -304,6 +304,15 @@ export const presets: Record<string, Preset> = {
'**/tests/**',
'**/__fixtures__/**',
],
nuget: {
ignorePaths: [
'**/node_modules/**',
'**/bower_components/**',
'**/vendor/**',
'**/examples/**',
'**/__fixtures__/**',
],
},
},
ignoreUnstable: {
description:
Expand Down
4 changes: 2 additions & 2 deletions lib/config/presets/local/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export async function fetchJSONFile(
repo: string,
fileName: string,
_endpoint?: string,
tag?: string | undefined,
tag?: string,
): Promise<Preset> {
let raw: string | null;
try {
Expand Down Expand Up @@ -37,7 +37,7 @@ export function getPresetFromEndpoint(
filePreset: string,
presetPath: string | undefined,
endpoint: string,
tag?: string | undefined,
tag?: string,
): Promise<Preset | undefined> {
return fetchPreset({
repo,
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export type PresetFetcher = (
repo: string,
fileName: string,
endpoint: string,
tag?: string | undefined,
tag?: string,
) => Promise<Preset | null | undefined>;

export type FetchPresetConfig = {
Expand Down
2 changes: 2 additions & 0 deletions lib/data/monorepo.json
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,7 @@
"dotnet-azure-ad-microsoft-identity-web": "https://github.com/AzureAD/microsoft-identity-web",
"dotnet-wcf": "https://github.com/dotnet/wcf",
"dropwizard": "https://github.com/dropwizard/dropwizard",
"duende-identityserver": "https://github.com/DuendeSoftware/IdentityServer",
"elastic-apm-agent-rum-js": "https://github.com/elastic/apm-agent-rum-js",
"electron-forge": [
"https://github.com/electron-userland/electron-forge",
Expand All @@ -278,6 +279,7 @@
"fabric-chaincode-node": "https://github.com/hyperledger/fabric-chaincode-node",
"fabric8-kubernetes-client": "https://github.com/fabric8io/kubernetes-client",
"feathers": "https://github.com/feathersjs/feathers",
"featuremanagement-dotnet": "https://github.com/microsoft/FeatureManagement-Dotnet",
"feign": "https://github.com/OpenFeign/feign",
"fela": "https://github.com/robinweser/fela",
"fimbullinter": "https://github.com/fimbullinter/wotan",
Expand Down
Loading

0 comments on commit 98eaddb

Please sign in to comment.