Merge branch 'main' into feat/sveltos

renovatebot · Jul 10, 2024 · e0ca135 · e0ca135
2 parents fcaf6ef + 1faa3be
commit e0ca135
Show file tree

Hide file tree

Showing 26 changed files with 916 additions and 115 deletions.
diff --git a/.github/actions/setup-node/action.yml b/.github/actions/setup-node/action.yml
@@ -53,7 +53,7 @@ runs:
         standalone: true
 
     - name: Setup Node
-      uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+      uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
       with:
         node-version: ${{ inputs.node-version }}
 

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -615,7 +615,7 @@ jobs:
           standalone: true
 
       - name: Setup Node.js
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ env.NODE_VERSION_TEST }}
 
@@ -661,7 +661,7 @@ jobs:
           show-progress: false
 
       - name: docker-config
-        uses: containerbase/internal-tools@4883899e455499739a005ede0bd2b8d4fb1afa82 # v3.3.4
+        uses: containerbase/internal-tools@80955f4a3e86de153243d9319aa91c4566b805cb # v3.3.5
         with:
           command: docker-config
 

diff --git a/.github/workflows/update-data.yml b/.github/workflows/update-data.yml
@@ -27,7 +27,7 @@ jobs:
           standalone: true
 
       - name: Set up Node.js ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@60edb5dd545a775178f52524783378180af0d1f8 # v4.0.2
+        uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4.0.3
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: pnpm

diff --git a/docs/usage/examples/self-hosting.md b/docs/usage/examples/self-hosting.md
@@ -438,14 +438,6 @@ RUN update-ca-certificates
 # Change back to the Ubuntu user
 USER 1000
 
-# Some tools come with their own certificate authority stores and thus need to trust the self-signed certificate or the entire OS store explicitly.
-# This list is _not_ comprehensive and other tools may require further configuration.
-#
-# Node
-ENV NODE_EXTRA_CA_CERTS=/usr/local/share/ca-certificates/self-signed-certificate.crt
-# Python
-RUN pip config set global.cert /etc/ssl/certs/ca-certificates.crt
-ENV REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-certificates.crt
 # OpenSSL
 ENV SSL_CERT_FILE=/etc/ssl/certs/ca-certificates.crt
 ```
diff --git a/docs/usage/node.md b/docs/usage/node.md
@@ -21,6 +21,7 @@ Renovate can manage the Node.js version in the following files:
 - The [`.nvmrc`](https://github.com/creationix/nvm#nvmrc) file for the [Node Version Manager](https://github.com/creationix/nvm)
 - The [`.node-version`](https://github.com/nodenv/nodenv#choosing-the-node-version) file for the [nodenv](https://github.com/nodenv/nodenv) environment manager
 - The [`.tool-versions`](https://asdf-vm.com/manage/configuration.html#tool-versions) file for the [asdf](https://github.com/asdf-vm/asdf) version manager
+- The [`.mise.toml`](https://mise.jdx.dev/configuration.html#mise-toml) file for the [mise](https://github.com/jdx/mise) version manager
 - The [`node_js`](https://docs.travis-ci.com/user/languages/javascript-with-nodejs/#Specifying-Node.js-versions) field in [`.travis.yml`](https://docs.travis-ci.com/user/customizing-the-build/)
 
 ## Configuring which version of npm Renovate uses

diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
@@ -514,7 +514,7 @@ const options: RenovateOptions[] = [
     description:
       'Change this value to override the default Renovate sidecar image.',
     type: 'string',
-    default: 'ghcr.io/containerbase/sidecar:10.12.0',
+    default: 'ghcr.io/containerbase/sidecar:10.15.3',
     globalOnly: true,
   },
   {

diff --git a/lib/modules/datasource/repology/readme.md b/lib/modules/datasource/repology/readme.md
@@ -33,7 +33,7 @@ First you would set a custom manager in your `renovate.json` file for `Dockerfil
 
 Then you would put comments in your Dockerfile, to tell Renovate where to find the updates:
 
-```docker
+```dockerfile
 FROM alpine:3.12.0@sha256:a15790640a6690aa1730c38cf0a440e2aa44aaca9b0e8931a9f2b0d7cc90fd65
 
 # renovate: datasource=repology depName=alpine_3_12/gcc versioning=loose

diff --git a/lib/modules/manager/api.ts b/lib/modules/manager/api.ts
@@ -56,6 +56,7 @@ import * as maven from './maven';
 import * as mavenWrapper from './maven-wrapper';
 import * as meteor from './meteor';
 import * as mint from './mint';
+import * as mise from './mise';
 import * as mix from './mix';
 import * as nix from './nix';
 import * as nodenv from './nodenv';
@@ -154,6 +155,7 @@ api.set('maven', maven);
 api.set('maven-wrapper', mavenWrapper);
 api.set('meteor', meteor);
 api.set('mint', mint);
+api.set('mise', mise);
 api.set('mix', mix);
 api.set('nix', nix);
 api.set('nodenv', nodenv);

diff --git a/lib/modules/manager/mise/__fixtures__/Mise.1.toml b/lib/modules/manager/mise/__fixtures__/Mise.1.toml
@@ -0,0 +1,19 @@
+[env]
+# supports arbitrary env vars so mise can be used like direnv/dotenv
+NODE_ENV = 'production'
+
+[tools]
+# specify single or multiple versions
+java = '21.0.2'
+erlang = ['23.3', '24.0']
+
+# supports everything you can do with .tool-versions currently
+node = ['16', 'prefix:20', 'ref:master', 'path:~/.nodes/14']
+
+[plugins]
+# specify a custom repo URL
+# note this will only be used if the plugin does not already exist
+python = 'https://github.com/asdf-community/asdf-python'
+
+[alias.node] # project-local aliases
+my_custom_node = '20'