From af7815d4cc188a880ce821934151c29b45359660 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 15:01:13 +0000 Subject: [PATCH 01/10] ci(deps): update renovate docker tag to v38.101.0 | datasource | package | from | to | | ---------- | ---------------------------- | -------- | -------- | | docker | ghcr.io/renovatebot/renovate | 38.100.1 | 38.101.0 | --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 18993d2b..47c9e67c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ concurrency: env: NODE_VERSION: 20 - RENOVATE_VERSION: 38.100.1 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate + RENOVATE_VERSION: 38.101.0 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate jobs: commitlint: From 157d4d8218eaa74b5bb7056b6ff946b58b31b34c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 12:01:23 +0000 Subject: [PATCH 02/10] ci(deps): update renovate docker tag to v38.101.1 | datasource | package | from | to | | ---------- | ---------------------------- | -------- | -------- | | docker | ghcr.io/renovatebot/renovate | 38.101.0 | 38.101.1 | --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 47c9e67c..71a2dc2a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ concurrency: env: NODE_VERSION: 20 - RENOVATE_VERSION: 38.101.0 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate + RENOVATE_VERSION: 38.101.1 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate jobs: commitlint: From b0990c14ff1dfc6cb767121c08f9e73d8d13cdde Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 00:11:46 +0000 Subject: [PATCH 03/10] docs: update references to actions/checkout to v4.2.0 | datasource | package | from | to | | ----------- | ---------------- | ------ | ------ | | github-tags | actions/checkout | v4.1.7 | v4.2.0 | --- README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index c3128596..49eb331e 100644 --- a/README.md +++ b/README.md @@ -97,7 +97,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -134,7 +134,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -186,7 +186,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -203,7 +203,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -225,7 +225,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -242,7 +242,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -277,7 +277,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -334,7 +334,7 @@ jobs: repositories: 'repo1,repo2' - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 @@ -374,7 +374,7 @@ For example if you wish to pass through some credentials for a [host rule](https runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: @@ -411,7 +411,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v4.1.7 + uses: actions/checkout@v4.2.0 - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: From 1ae1ac05cd97981a2a419f16995c0c45667f8e65 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 03:18:05 +0000 Subject: [PATCH 04/10] docs: update references to ghcr.io/renovatebot/renovate to v38.101.1 | datasource | package | from | to | | ---------- | ---------------------------- | ------- | -------- | | docker | ghcr.io/renovatebot/renovate | 38.80.0 | 38.101.1 | --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 49eb331e..f0f69dbd 100644 --- a/README.md +++ b/README.md @@ -216,7 +216,7 @@ The Renovate version to use. If omitted the action will use the `latest` Docker tag. Check [the available tags on Docker Hub](https://hub.docker.com/r/renovate/renovate/tags). -This sample will use `ghcr.io/renovatebot/renovate:38.80.0` image. +This sample will use `ghcr.io/renovatebot/renovate:38.101.1` image. ```yml .... @@ -229,7 +229,7 @@ jobs: - name: Self-hosted Renovate uses: renovatebot/github-action@v40.2.10 with: - renovate-version: 38.80.0 + renovate-version: 38.101.1 token: ${{ secrets.RENOVATE_TOKEN }} ``` @@ -508,7 +508,7 @@ jobs: with: configurationFile: renovate.json5 token: ${{ secrets.RENOVATE_TOKEN }} - renovate-version: 38.80.0 + renovate-version: 38.101.1 env: # This enables the cache -- if this is set, it's not necessary to add it to renovate.json. RENOVATE_REPOSITORY_CACHE: ${{ github.event.inputs.repoCache || 'enabled' }} From 669f02b0b3362671ad9af616ae46044b488a68e8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 06:12:22 +0000 Subject: [PATCH 05/10] build(deps): lock file maintenance --- pnpm-lock.yaml | 112 ++++++++++++++++++++++++++----------------------- 1 file changed, 59 insertions(+), 53 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 68eceab3..4d657742 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -268,14 +268,14 @@ packages: '@octokit/openapi-types@22.2.0': resolution: {integrity: sha512-QBhVjcUa9W7Wwhm6DBFu6ZZ+1/t/oYxqc2tp81Pi41YNuJinbFRx8B133qVOrAaBbF7D/m0Et6f9/pZt9Rc+tg==} - '@octokit/plugin-paginate-rest@11.3.3': - resolution: {integrity: sha512-o4WRoOJZlKqEEgj+i9CpcmnByvtzoUYC6I8PD2SA95M+BJ2x8h7oLcVOg9qcowWXBOdcTRsMZiwvM3EyLm9AfA==} + '@octokit/plugin-paginate-rest@11.3.5': + resolution: {integrity: sha512-cgwIRtKrpwhLoBi0CUNuY83DPGRMaWVjqVI/bGKsLJ4PzyWZNaEmhHroI2xlrVXkk6nFv0IsZpOp+ZWSWUS2AQ==} engines: {node: '>= 18'} peerDependencies: '@octokit/core': '>=6' - '@octokit/plugin-retry@7.1.1': - resolution: {integrity: sha512-G9Ue+x2odcb8E1XIPhaFBnTTIrrUDfXN05iFXiqhR+SeeeDMMILcAnysOsxUpEWcQp2e5Ft397FCXTcPkiPkLw==} + '@octokit/plugin-retry@7.1.2': + resolution: {integrity: sha512-XOWnPpH2kJ5VTwozsxGurw+svB2e61aWlmk5EVIYZPwFK5F9h4cyPyj9CIKRyMXMHSwpIsI3mPOdpMmrRhe7UQ==} engines: {node: '>= 18'} peerDependencies: '@octokit/core': '>=6' @@ -286,20 +286,16 @@ packages: peerDependencies: '@octokit/core': ^6.0.0 - '@octokit/request-error@6.1.4': - resolution: {integrity: sha512-VpAhIUxwhWZQImo/dWAN/NpPqqojR6PSLgLYAituLM6U+ddx9hCioFGwBr5Mi+oi5CLeJkcAs3gJ0PYYzU6wUg==} + '@octokit/request-error@6.1.5': + resolution: {integrity: sha512-IlBTfGX8Yn/oFPMwSfvugfncK2EwRLjzbrpifNaMY8o/HTEAFqCA1FZxjD9cWvSKBHgrIhc4CSBIzMxiLsbzFQ==} engines: {node: '>= 18'} '@octokit/request@9.1.3': resolution: {integrity: sha512-V+TFhu5fdF3K58rs1pGUJIDH5RZLbZm5BI+MNF+6o/ssFNT4vWlCh/tVpF3NxGtP15HUxTTMUbsG5llAuU2CZA==} engines: {node: '>= 18'} - '@octokit/types@13.5.0': - resolution: {integrity: sha512-HdqWTf5Z3qwDVlzCrP8UJquMwunpDiMPt5er+QjGzL4hqr/vBVY/MauQgS1xWxCDT1oMx1EULyqxncdCY/NVSQ==} - - '@pkgjs/parseargs@0.11.0': - resolution: {integrity: sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==} - engines: {node: '>=14'} + '@octokit/types@13.6.0': + resolution: {integrity: sha512-CrooV/vKCXqwLa+osmHLIMUb87brpgUqlqkPGc6iE2wCkUvTrHiXFMhAKoDDaAAYJrtKtrFTgSQTg5nObBEaew==} '@pkgr/core@0.1.1': resolution: {integrity: sha512-cq8o4cWH0ibXh9VGi5P20Tu9XF/0fFXl9EUinr9QfTM7a7p0oTA4iJRCQWppXR1Pg8dSM0UCItCkPwsk9qWWYA==} @@ -861,8 +857,8 @@ packages: resolution: {integrity: sha512-VyhnebXciFV2DESc+p6B+y0LjSm0krU4OgJN44qFAhBY0TJ+1V61tYD2+wHusZ6F9n5K+vl8k0sTy7PEfV4qpg==} engines: {node: '>=16.17'} - execa@9.3.1: - resolution: {integrity: sha512-gdhefCCNy/8tpH/2+ajP9IQc14vXchNdd0weyzSJEFURhRMGncQ+zKFxwjAufIewPEJm9BPOaJnvg2UtlH2gPQ==} + execa@9.4.0: + resolution: {integrity: sha512-yKHlle2YGxZE842MERVIplWwNH5VYmqqcPFgtnlU//K8gxuFFXu0pwd/CrfXTumFpeEiufsP7+opT/bPJa1yVw==} engines: {node: ^18.19.0 || >=20.5.0} fast-deep-equal@3.1.3: @@ -878,8 +874,8 @@ packages: fast-levenshtein@2.0.6: resolution: {integrity: sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==} - fast-uri@3.0.1: - resolution: {integrity: sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==} + fast-uri@3.0.2: + resolution: {integrity: sha512-GR6f0hD7XXyNJa25Tb9BuIdN0tdr+0BMi6/CJPH3wJO1JjNG3n/VsSw38AwRdKZABm8lGbPfakLRkYzx2V9row==} fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} @@ -1201,8 +1197,8 @@ packages: resolution: {integrity: sha512-3YZcUUR2Wt1WsapF+S/WiA2WmlW0cWAoPccMqne7AxEBhCdFeTPjfv/Axb8V2gyCgY3nRw+ksZ3xSUX+R47iAg==} engines: {node: ^18.17 || >=20.6.1} - jackspeak@4.0.1: - resolution: {integrity: sha512-cub8rahkh0Q/bw1+GxP7aeSe29hHHn2V4m29nnDlvCdlgU+3UGxkZp7Z53jLUdpX3jdTO0nJZUDl3xvbWc2Xog==} + jackspeak@4.0.2: + resolution: {integrity: sha512-bZsjR/iRjl1Nk1UkjGpAzLNfQtzuijhn2g+pbZb98HQ1Gk8vM9hfbxeMBP+M2/UUdwj0RqGG3mlvk2MsAqwvEw==} engines: {node: 20 || >=22} java-properties@1.0.2: @@ -1467,6 +1463,10 @@ packages: resolution: {integrity: sha512-ppwTtiJZq0O/ai0z7yfudtBpWIoxM8yE6nHi1X47eFR2EWORqfbu6CnPlNsjeN683eT0qG6H/Pyf9fCcvjnnnQ==} engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0} + npm-run-path@6.0.0: + resolution: {integrity: sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==} + engines: {node: '>=18'} + npm@10.8.3: resolution: {integrity: sha512-0IQlyAYvVtQ7uOhDFYZCGK8kkut2nh8cpAdA9E6FvRSJaTgtZRZgNjlC5ZCct//L73ygrpY93CxXpRJDtNqPVg==} engines: {node: ^18.17.0 || >=20.5.0} @@ -1616,8 +1616,8 @@ packages: resolution: {integrity: sha512-U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==} engines: {node: '>=4'} - package-json-from-dist@1.0.0: - resolution: {integrity: sha512-dATvCeZN/8wQsGywez1mzHtTlP22H8OEfPrVMLNr4/eGa+ijtLn/6M5f0dY8UKNrC2O9UCU6SSoG3qRKnt7STw==} + package-json-from-dist@1.0.1: + resolution: {integrity: sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==} parent-module@1.0.1: resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==} @@ -2090,6 +2090,10 @@ packages: resolution: {integrity: sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==} engines: {node: '>=18'} + unicorn-magic@0.3.0: + resolution: {integrity: sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==} + engines: {node: '>=18'} + unique-string@3.0.0: resolution: {integrity: sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==} engines: {node: '>=12'} @@ -2431,60 +2435,57 @@ snapshots: '@octokit/auth-token': 5.1.1 '@octokit/graphql': 8.1.1 '@octokit/request': 9.1.3 - '@octokit/request-error': 6.1.4 - '@octokit/types': 13.5.0 + '@octokit/request-error': 6.1.5 + '@octokit/types': 13.6.0 before-after-hook: 3.0.2 universal-user-agent: 7.0.2 '@octokit/endpoint@10.1.1': dependencies: - '@octokit/types': 13.5.0 + '@octokit/types': 13.6.0 universal-user-agent: 7.0.2 '@octokit/graphql@8.1.1': dependencies: '@octokit/request': 9.1.3 - '@octokit/types': 13.5.0 + '@octokit/types': 13.6.0 universal-user-agent: 7.0.2 '@octokit/openapi-types@22.2.0': {} - '@octokit/plugin-paginate-rest@11.3.3(@octokit/core@6.1.2)': + '@octokit/plugin-paginate-rest@11.3.5(@octokit/core@6.1.2)': dependencies: '@octokit/core': 6.1.2 - '@octokit/types': 13.5.0 + '@octokit/types': 13.6.0 - '@octokit/plugin-retry@7.1.1(@octokit/core@6.1.2)': + '@octokit/plugin-retry@7.1.2(@octokit/core@6.1.2)': dependencies: '@octokit/core': 6.1.2 - '@octokit/request-error': 6.1.4 - '@octokit/types': 13.5.0 + '@octokit/request-error': 6.1.5 + '@octokit/types': 13.6.0 bottleneck: 2.19.5 '@octokit/plugin-throttling@9.3.1(@octokit/core@6.1.2)': dependencies: '@octokit/core': 6.1.2 - '@octokit/types': 13.5.0 + '@octokit/types': 13.6.0 bottleneck: 2.19.5 - '@octokit/request-error@6.1.4': + '@octokit/request-error@6.1.5': dependencies: - '@octokit/types': 13.5.0 + '@octokit/types': 13.6.0 '@octokit/request@9.1.3': dependencies: '@octokit/endpoint': 10.1.1 - '@octokit/request-error': 6.1.4 - '@octokit/types': 13.5.0 + '@octokit/request-error': 6.1.5 + '@octokit/types': 13.6.0 universal-user-agent: 7.0.2 - '@octokit/types@13.5.0': + '@octokit/types@13.6.0': dependencies: '@octokit/openapi-types': 22.2.0 - '@pkgjs/parseargs@0.11.0': - optional: true - '@pkgr/core@0.1.1': {} '@pnpm/config.env-replace@1.1.0': {} @@ -2536,8 +2537,8 @@ snapshots: '@semantic-release/github@10.3.5(semantic-release@24.1.1(typescript@5.6.2))': dependencies: '@octokit/core': 6.1.2 - '@octokit/plugin-paginate-rest': 11.3.3(@octokit/core@6.1.2) - '@octokit/plugin-retry': 7.1.1(@octokit/core@6.1.2) + '@octokit/plugin-paginate-rest': 11.3.5(@octokit/core@6.1.2) + '@octokit/plugin-retry': 7.1.2(@octokit/core@6.1.2) '@octokit/plugin-throttling': 9.3.1(@octokit/core@6.1.2) '@semantic-release/error': 4.0.0 aggregate-error: 5.0.0 @@ -2559,7 +2560,7 @@ snapshots: dependencies: '@semantic-release/error': 4.0.0 aggregate-error: 5.0.0 - execa: 9.3.1 + execa: 9.4.0 fs-extra: 11.2.0 lodash-es: 4.17.21 nerf-dart: 1.0.0 @@ -2749,7 +2750,7 @@ snapshots: ajv@8.17.1: dependencies: fast-deep-equal: 3.1.3 - fast-uri: 3.0.1 + fast-uri: 3.0.2 json-schema-traverse: 1.0.0 require-from-string: 2.0.2 @@ -3124,7 +3125,7 @@ snapshots: signal-exit: 4.1.0 strip-final-newline: 3.0.0 - execa@9.3.1: + execa@9.4.0: dependencies: '@sindresorhus/merge-streams': 4.0.0 cross-spawn: 7.0.3 @@ -3133,7 +3134,7 @@ snapshots: human-signals: 8.0.0 is-plain-obj: 4.1.0 is-stream: 4.0.1 - npm-run-path: 5.3.0 + npm-run-path: 6.0.0 pretty-ms: 9.1.0 signal-exit: 4.1.0 strip-final-newline: 4.0.0 @@ -3153,7 +3154,7 @@ snapshots: fast-levenshtein@2.0.6: {} - fast-uri@3.0.1: {} + fast-uri@3.0.2: {} fastq@1.17.1: dependencies: @@ -3270,10 +3271,10 @@ snapshots: glob@11.0.0: dependencies: foreground-child: 3.3.0 - jackspeak: 4.0.1 + jackspeak: 4.0.2 minimatch: 10.0.1 minipass: 7.1.2 - package-json-from-dist: 1.0.0 + package-json-from-dist: 1.0.1 path-scurry: 2.0.0 glob@7.2.3: @@ -3460,11 +3461,9 @@ snapshots: lodash.isstring: 4.0.1 lodash.uniqby: 4.7.0 - jackspeak@4.0.1: + jackspeak@4.0.2: dependencies: '@isaacs/cliui': 8.0.2 - optionalDependencies: - '@pkgjs/parseargs': 0.11.0 java-properties@1.0.2: {} @@ -3705,6 +3704,11 @@ snapshots: dependencies: path-key: 4.0.0 + npm-run-path@6.0.0: + dependencies: + path-key: 4.0.0 + unicorn-magic: 0.3.0 + npm@10.8.3: {} object-assign@4.1.1: {} @@ -3774,7 +3778,7 @@ snapshots: p-try@1.0.0: {} - package-json-from-dist@1.0.0: {} + package-json-from-dist@1.0.1: {} parent-module@1.0.1: dependencies: @@ -3929,7 +3933,7 @@ snapshots: rimraf@6.0.1: dependencies: glob: 11.0.0 - package-json-from-dist: 1.0.0 + package-json-from-dist: 1.0.1 run-parallel@1.2.0: dependencies: @@ -3948,7 +3952,7 @@ snapshots: cosmiconfig: 9.0.0(typescript@5.6.2) debug: 4.3.7 env-ci: 11.1.0 - execa: 9.3.1 + execa: 9.4.0 figures: 6.1.0 find-versions: 6.0.0 get-stream: 6.0.1 @@ -4220,6 +4224,8 @@ snapshots: unicorn-magic@0.1.0: {} + unicorn-magic@0.3.0: {} + unique-string@3.0.0: dependencies: crypto-random-string: 4.0.0 From c0afe86658f7f78d9146f27bf1ef7f8993a48036 Mon Sep 17 00:00:00 2001 From: Mike Ryan Date: Mon, 30 Sep 2024 06:24:25 -0400 Subject: [PATCH 06/10] feat: add `docker-socket-host-path` input (#862) Co-authored-by: Michael Kriese --- README.md | 7 +++++++ action.yml | 7 +++++++ src/input.ts | 4 ++++ src/renovate.ts | 10 +++++++++- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index f0f69dbd..f4d282d2 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,7 @@ GitHub Action to run Renovate self-hosted. - [`configurationFile`](#configurationfile) - [`docker-cmd-file`](#docker-cmd-file) - [`docker-network`](#docker-network) + - [`docker-socket-host-path`](#docker-socket-host-path) - [`docker-user`](#docker-user) - [`docker-volumes`](#docker-volumes) - [`env-regex`](#env-regex) @@ -113,6 +114,12 @@ Specify a network to run container in. You can use `${{ job.container.network }}` to run renovate container [in the same network as other containers for this job](https://docs.github.com/en/actions/learn-github-actions/contexts#job-context), or set it to `host` to run in the same network as github runner, or specify any custom network. +### `docker-socket-host-path` + +Allows the overriding of the host path for the Docker socket that is mounted into the container. +Useful on systems where the host Docker socket is located somewhere other than `/var/run/docker.sock` (the default). +Only applicable when `mount-docker-socket` is true. + ### `docker-user` Specify a user (or user-id) to run docker command. diff --git a/action.yml b/action.yml index b565834b..d2e274ec 100644 --- a/action.yml +++ b/action.yml @@ -36,6 +36,13 @@ inputs: can use Docker. Also add the user inside the renovate container to the docker group for socket permissions. required: false + docker-socket-host-path: + description: | + Allows the overriding of the host path for the Docker socket that is mounted into the container. + Useful on systems where the host Docker socket is located somewhere other than '/var/run/docker.sock' (the default). + Only applicable when 'mount-docker-socket' is true. + required: false + default: /var/run/docker.sock docker-cmd-file: description: | Override docker command. Default command is `renovate` diff --git a/src/input.ts b/src/input.ts index 693b1528..3b8c8791 100644 --- a/src/input.ts +++ b/src/input.ts @@ -73,6 +73,10 @@ class Input { return core.getInput('mount-docker-socket') === 'true'; } + dockerSocketHostPath(): string { + return core.getInput('docker-socket-host-path') || '/var/run/docker.sock'; + } + getDockerCmdFile(): string | null { const cmdFile = core.getInput('docker-cmd-file'); return !!cmdFile && cmdFile !== '' ? path.resolve(cmdFile) : null; diff --git a/src/renovate.ts b/src/renovate.ts index fb2d35b8..2edb32cc 100644 --- a/src/renovate.ts +++ b/src/renovate.ts @@ -33,8 +33,16 @@ class Renovate { } if (this.input.mountDockerSocket()) { + const sockPath = this.input.dockerSocketHostPath(); + const stat = await fs.stat(sockPath); + if (!stat.isSocket()) { + throw new Error( + `docker socket host path '${sockPath}' MUST exist and be a socket`, + ); + } + dockerArguments.push( - '--volume /var/run/docker.sock:/var/run/docker.sock', + `--volume ${sockPath}:/var/run/docker.sock`, `--group-add ${await this.getDockerGroupId()}`, ); } From 2f7cf7048f9d63dfc3240f480158d67581bbfaae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 12:05:39 +0000 Subject: [PATCH 07/10] ci(deps): update renovate docker tag to v38.103.1 | datasource | package | from | to | | ---------- | ---------------------------- | -------- | -------- | | docker | ghcr.io/renovatebot/renovate | 38.101.1 | 38.103.1 | --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 71a2dc2a..a9a65d1c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ concurrency: env: NODE_VERSION: 20 - RENOVATE_VERSION: 38.101.1 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate + RENOVATE_VERSION: 38.103.1 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate jobs: commitlint: From 336c9d50271682c864cad7754e64fe5fb318102a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 15:28:42 +0000 Subject: [PATCH 08/10] build(deps): update dependency @vercel/ncc to v0.38.2 | datasource | package | from | to | | ---------- | ----------- | ------ | ------ | | npm | @vercel/ncc | 0.38.1 | 0.38.2 | --- package.json | 2 +- pnpm-lock.yaml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7e85247b..53710a7d 100644 --- a/package.json +++ b/package.json @@ -45,7 +45,7 @@ "@types/node": "20.16.5", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", - "@vercel/ncc": "0.38.1", + "@vercel/ncc": "0.38.2", "conventional-changelog-conventionalcommits": "8.0.0", "eslint": "8.57.1", "eslint-config-prettier": "9.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 4d657742..0596656e 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -43,8 +43,8 @@ importers: specifier: 6.21.0 version: 6.21.0(eslint@8.57.1)(typescript@5.6.2) '@vercel/ncc': - specifier: 0.38.1 - version: 0.38.1 + specifier: 0.38.2 + version: 0.38.2 conventional-changelog-conventionalcommits: specifier: 8.0.0 version: 8.0.0 @@ -457,8 +457,8 @@ packages: '@ungap/structured-clone@1.2.0': resolution: {integrity: sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==} - '@vercel/ncc@0.38.1': - resolution: {integrity: sha512-IBBb+iI2NLu4VQn3Vwldyi2QwaXt5+hTyh58ggAMoCGE6DJmPvwL3KPBWcJl1m9LYPChBLE980Jw+CS4Wokqxw==} + '@vercel/ncc@0.38.2': + resolution: {integrity: sha512-3yel3jaxUg9pHBv4+KeC9qlbdZPug+UMtUOlhvpDYCMSgcNSrS2Hv1LoqMsOV7hf2lYscx+BESfJOIla1WsmMQ==} hasBin: true JSONStream@1.3.5: @@ -2707,7 +2707,7 @@ snapshots: '@ungap/structured-clone@1.2.0': {} - '@vercel/ncc@0.38.1': {} + '@vercel/ncc@0.38.2': {} JSONStream@1.3.5: dependencies: From 6c8aefd37f3f615ff596707762ad35ba486eb1ba Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:11:27 +0000 Subject: [PATCH 09/10] ci(deps): update renovate docker tag to v38.105.0 | datasource | package | from | to | | ---------- | ---------------------------- | -------- | -------- | | docker | ghcr.io/renovatebot/renovate | 38.103.1 | 38.105.0 | --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a9a65d1c..4af97b00 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -11,7 +11,7 @@ concurrency: env: NODE_VERSION: 20 - RENOVATE_VERSION: 38.103.1 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate + RENOVATE_VERSION: 38.105.0 # renovate: datasource=docker depName=renovate packageName=ghcr.io/renovatebot/renovate jobs: commitlint: From 43cf8481c5721ebe83ec850ee44cebedc0b835f6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:29:13 +0000 Subject: [PATCH 10/10] chore(deps): update dependency @types/node to v20.16.6 | datasource | package | from | to | | ---------- | ----------- | ------- | ------- | | npm | @types/node | 20.16.5 | 20.16.6 | --- package.json | 2 +- pnpm-lock.yaml | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index 53710a7d..4a5a11a1 100644 --- a/package.json +++ b/package.json @@ -42,7 +42,7 @@ "@semantic-release/github": "10.3.5", "@semantic-release/npm": "12.0.1", "@tsconfig/node20": "20.1.4", - "@types/node": "20.16.5", + "@types/node": "20.16.6", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", "@vercel/ncc": "0.38.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0596656e..595b0943 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -17,7 +17,7 @@ importers: devDependencies: '@commitlint/cli': specifier: 19.5.0 - version: 19.5.0(@types/node@20.16.5)(typescript@5.6.2) + version: 19.5.0(@types/node@20.16.6)(typescript@5.6.2) '@commitlint/config-conventional': specifier: 19.5.0 version: 19.5.0 @@ -34,8 +34,8 @@ importers: specifier: 20.1.4 version: 20.1.4 '@types/node': - specifier: 20.16.5 - version: 20.16.5 + specifier: 20.16.6 + version: 20.16.6 '@typescript-eslint/eslint-plugin': specifier: 6.21.0 version: 6.21.0(@typescript-eslint/parser@6.21.0(eslint@8.57.1)(typescript@5.6.2))(eslint@8.57.1)(typescript@5.6.2) @@ -80,7 +80,7 @@ importers: version: 24.1.1(typescript@5.6.2) ts-node: specifier: 10.9.2 - version: 10.9.2(@types/node@20.16.5)(typescript@5.6.2) + version: 10.9.2(@types/node@20.16.6)(typescript@5.6.2) typescript: specifier: 5.6.2 version: 5.6.2 @@ -387,8 +387,8 @@ packages: '@types/json-schema@7.0.15': resolution: {integrity: sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==} - '@types/node@20.16.5': - resolution: {integrity: sha512-VwYCweNo3ERajwy0IUlqqcyZ8/A7Zwa9ZP3MnENWcB11AejO+tLy3pu850goUW2FC/IJMdZUfKpX/yxL1gymCA==} + '@types/node@20.16.6': + resolution: {integrity: sha512-T7PpxM/6yeDE+AdlVysT62BX6/bECZOmQAgiFg5NoBd5MQheZ3tzal7f1wvzfiEcmrcJNRi2zRr2nY2zF+0uqw==} '@types/normalize-package-data@2.4.4': resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==} @@ -2247,11 +2247,11 @@ snapshots: '@colors/colors@1.5.0': optional: true - '@commitlint/cli@19.5.0(@types/node@20.16.5)(typescript@5.6.2)': + '@commitlint/cli@19.5.0(@types/node@20.16.6)(typescript@5.6.2)': dependencies: '@commitlint/format': 19.5.0 '@commitlint/lint': 19.5.0 - '@commitlint/load': 19.5.0(@types/node@20.16.5)(typescript@5.6.2) + '@commitlint/load': 19.5.0(@types/node@20.16.6)(typescript@5.6.2) '@commitlint/read': 19.5.0 '@commitlint/types': 19.5.0 tinyexec: 0.3.0 @@ -2298,7 +2298,7 @@ snapshots: '@commitlint/rules': 19.5.0 '@commitlint/types': 19.5.0 - '@commitlint/load@19.5.0(@types/node@20.16.5)(typescript@5.6.2)': + '@commitlint/load@19.5.0(@types/node@20.16.6)(typescript@5.6.2)': dependencies: '@commitlint/config-validator': 19.5.0 '@commitlint/execute-rule': 19.5.0 @@ -2306,7 +2306,7 @@ snapshots: '@commitlint/types': 19.5.0 chalk: 5.3.0 cosmiconfig: 9.0.0(typescript@5.6.2) - cosmiconfig-typescript-loader: 5.0.0(@types/node@20.16.5)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2) + cosmiconfig-typescript-loader: 5.0.0(@types/node@20.16.6)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2) lodash.isplainobject: 4.0.6 lodash.merge: 4.6.2 lodash.uniq: 4.5.0 @@ -2607,11 +2607,11 @@ snapshots: '@types/conventional-commits-parser@5.0.0': dependencies: - '@types/node': 20.16.5 + '@types/node': 20.16.6 '@types/json-schema@7.0.15': {} - '@types/node@20.16.5': + '@types/node@20.16.6': dependencies: undici-types: 6.19.8 @@ -2931,9 +2931,9 @@ snapshots: core-util-is@1.0.3: {} - cosmiconfig-typescript-loader@5.0.0(@types/node@20.16.5)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2): + cosmiconfig-typescript-loader@5.0.0(@types/node@20.16.6)(cosmiconfig@9.0.0(typescript@5.6.2))(typescript@5.6.2): dependencies: - '@types/node': 20.16.5 + '@types/node': 20.16.6 cosmiconfig: 9.0.0(typescript@5.6.2) jiti: 1.21.6 typescript: 5.6.2 @@ -4175,14 +4175,14 @@ snapshots: dependencies: typescript: 5.6.2 - ts-node@10.9.2(@types/node@20.16.5)(typescript@5.6.2): + ts-node@10.9.2(@types/node@20.16.6)(typescript@5.6.2): dependencies: '@cspotcode/source-map-support': 0.8.1 '@tsconfig/node10': 1.0.11 '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.4 - '@types/node': 20.16.5 + '@types/node': 20.16.6 acorn: 8.12.1 acorn-walk: 8.3.4 arg: 4.1.3