From 4a9c48f31cb160866218d77574cbc86bacf56422 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Tue, 6 Aug 2024 09:18:51 +0200 Subject: [PATCH 001/106] feat: add renovate --- .gitlab-ci.yml | 21 ++++++++++++++++++++- config.js | 8 ++++++++ renovate.json | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 76 insertions(+), 1 deletion(-) create mode 100644 config.js create mode 100644 renovate.json diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f356980f06..ea155e1043 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,6 +15,7 @@ stages: - lint - build - release + - deploy variables: GIT_SUBMODULE_STRATEGY: none @@ -177,7 +178,25 @@ appimage-amd64: paths: - 'projects/frontend/*.AppImage*' expire_in: 1 week - + + +include: + - project: 'renovate-bot/renovate-runner' + file: '/templates/renovate.gitlab-ci.yml' + +renovate: + rules: + - if: $CI_COMMIT_BRANCH + changes: + - renovate.json + - config.js + when: always + - if: $CI_PIPELINE_SOURCE =~ "/^(schedule|pipeline|trigger)$/" && $WHICH_SCHEDULE == "renovate" + when: always + - when: never + variables: + RENOVATE_EXTRA_FLAGS: 'beudbeud/recalbox' + .build_template: &build_definition stage: build diff --git a/config.js b/config.js new file mode 100644 index 0000000000..8a5cd1890c --- /dev/null +++ b/config.js @@ -0,0 +1,8 @@ +module.exports = { + endpoint: 'https://gitlab.com/api/v4', + hostRules: [], + platform: 'gitlab', + username: 'renovate-bot', + gitAuthor: 'Renovate Bot ', + autodiscover: false, +}; diff --git a/renovate.json b/renovate.json new file mode 100644 index 0000000000..526a8ac5aa --- /dev/null +++ b/renovate.json @@ -0,0 +1,48 @@ +{ + "$schema": "https://docs.renovatebot.com/renovate-schema.json", + "extends": [ + "config:recommended", + ":dependencyDashboard", + ":rebaseStalePrs", + ":disableRateLimiting" + ], + "labels": ["renovate"], + "lockFileMaintenance": {"enabled": false}, + "separateMajorMinor": false, + "recreateWhen": "always", + "enabledManagers": ["custom.regex"], + "ignorePaths": [ + "**custom/**", + "**/buildroot/**", + "**/libretro-retrodream/**"], + "packageRules": [ + { + "matchPackagePatterns": ["*"], + "enabled": false + }, + { + "matchPackagePatterns": ["/libretro/"], + "enabled": true, + "labels": ["renovate", "Components::Emulators"] + } + ], + "customManagers": [ + { + "customType": "regex", + "fileMatch": ["\\.mk$"], + "matchStringsStrategy": "combination", + "matchStrings": [ + ".*_VERSION = (?v\\d+\\.\\d+\\.\\d)\n", + ".*_VERSION = (?\\d+\\.\\d+\\.\\d)\n", + ".*_VERSION = (?[a-f0-9]{40})\\n", + ".*_SITE = https:\\/\\/github\\.com\\/(?.*)\\/(?.*?)\\.git\\n", + ".*_SITE = https:\\/\\/github\\.com\\/(?.*)\\/(?.*?)\\n", + ".*_SITE = .* github,(?.*),(?.*),.*?\\n" + ], + "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", + "depNameTemplate": "{{{depName}}}", + "packageNameTemplate": "https://github.com/{{{orgName}}}/{{{depName}}}", + "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" + } + ] +} -- GitLab From c92078b8bff1c3629827c446be8eb0070a17623a Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 11:25:53 +0200 Subject: [PATCH 002/106] fix: prefix commit message --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 526a8ac5aa..a3bbae6ee9 100644 --- a/renovate.json +++ b/renovate.json @@ -23,7 +23,8 @@ { "matchPackagePatterns": ["/libretro/"], "enabled": true, - "labels": ["renovate", "Components::Emulators"] + "labels": ["renovate", "Components::Emulators"], + "commitMessagePrefix": "chore," } ], "customManagers": [ -- GitLab From c24789fc455618e16909ce29b3c962e9fd9152f5 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 11:33:00 +0200 Subject: [PATCH 003/106] fix: no pipeline for renovate MRs --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea155e1043..b8cfa5d3ca 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,7 @@ image: docker:latest - master - merge_requests - tags + - $CI_MERGE_REQUEST_LABELS !=~ /renovate/ stages: - lint -- GitLab From 59453ee52a44f21aa4cdb2019d30275922dc273d Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 14:01:01 +0200 Subject: [PATCH 004/106] fix: no pipeline for renovate MRs --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b8cfa5d3ca..fe8f8f4ef1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,7 +192,7 @@ renovate: - renovate.json - config.js when: always - - if: $CI_PIPELINE_SOURCE =~ "/^(schedule|pipeline|trigger)$/" && $WHICH_SCHEDULE == "renovate" + - if: $CI_PIPELINE_SOURCE =~ "/^(schedule)$/" && $WHICH_SCHEDULE == "renovate" when: always - when: never variables: -- GitLab From 2eb02806be1aaec5f416b77340cd9ea785faa85d Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 14:26:20 +0200 Subject: [PATCH 005/106] fix: no pipeline for renovate MRs --- .gitlab-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe8f8f4ef1..a1b1becc70 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,9 +13,6 @@ image: docker:latest - $CI_MERGE_REQUEST_LABELS !=~ /renovate/ stages: - - lint - - build - - release - deploy variables: -- GitLab From fd362155251addcfc362e90d075f115651b4a5b2 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 14:29:17 +0200 Subject: [PATCH 006/106] fix: no pipeline for renovate MRs --- .gitlab-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a1b1becc70..72d660b39e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,11 +184,6 @@ include: renovate: rules: - - if: $CI_COMMIT_BRANCH - changes: - - renovate.json - - config.js - when: always - if: $CI_PIPELINE_SOURCE =~ "/^(schedule)$/" && $WHICH_SCHEDULE == "renovate" when: always - when: never -- GitLab From 1ebc3815346c15a2582292ea73103c0d8d9a6524 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 15:08:33 +0200 Subject: [PATCH 007/106] fix: no pipeline for renovate MRs --- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 72d660b39e..8f2bbeff3d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,9 @@ image: docker:latest - $CI_MERGE_REQUEST_LABELS !=~ /renovate/ stages: + - lint + - build + - release - deploy variables: -- GitLab From 0ba92389f1ceff677d7b930bc3421e412df755d7 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 16:18:19 +0200 Subject: [PATCH 008/106] fix: change prefix --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index a3bbae6ee9..92885f801a 100644 --- a/renovate.json +++ b/renovate.json @@ -24,7 +24,7 @@ "matchPackagePatterns": ["/libretro/"], "enabled": true, "labels": ["renovate", "Components::Emulators"], - "commitMessagePrefix": "chore," + "commitMessagePrefix": "chore\\:" } ], "customManagers": [ -- GitLab From 07a3cc20998f31a92e86dbb84ff3b827a5dc1e14 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 16:20:31 +0200 Subject: [PATCH 009/106] fix: commit action --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 92885f801a..4eaf2705c7 100644 --- a/renovate.json +++ b/renovate.json @@ -24,7 +24,8 @@ "matchPackagePatterns": ["/libretro/"], "enabled": true, "labels": ["renovate", "Components::Emulators"], - "commitMessagePrefix": "chore\\:" + "commitMessagePrefix": "chore\\:", + "commitMessageAction": "Bump" } ], "customManagers": [ -- GitLab From ab051b1c945fd95a587cb79c45c60bfa7bcb2235 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 17:03:14 +0200 Subject: [PATCH 010/106] fix: commit message --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 4eaf2705c7..37dc74874d 100644 --- a/renovate.json +++ b/renovate.json @@ -24,7 +24,7 @@ "matchPackagePatterns": ["/libretro/"], "enabled": true, "labels": ["renovate", "Components::Emulators"], - "commitMessagePrefix": "chore\\:", + "commitMessagePrefix": "chore:", "commitMessageAction": "Bump" } ], -- GitLab From 4d92403f80570d5ef68a0a5b2f5e788df03b1942 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 18:12:53 +0200 Subject: [PATCH 011/106] fix: lowercase commit message --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 37dc74874d..4c387959b1 100644 --- a/renovate.json +++ b/renovate.json @@ -25,7 +25,8 @@ "enabled": true, "labels": ["renovate", "Components::Emulators"], "commitMessagePrefix": "chore:", - "commitMessageAction": "Bump" + "commitMessageAction": "bump", + "commitMessageLowerCase": "auto" } ], "customManagers": [ -- GitLab From c51e54c471028ba24bf81da8b9fd7ddc81339c83 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 18:33:45 +0200 Subject: [PATCH 012/106] fix: lowercase commit message --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 4c387959b1..8fe2bc9d10 100644 --- a/renovate.json +++ b/renovate.json @@ -43,7 +43,7 @@ ".*_SITE = .* github,(?.*),(?.*),.*?\\n" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", - "depNameTemplate": "{{{depName}}}", + "depNameTemplate": "{{{ lowercase depName}}}", "packageNameTemplate": "https://github.com/{{{orgName}}}/{{{depName}}}", "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" } -- GitLab From 6c88b9ae347aa83931ce364d213fcadc5ee96351 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 19:18:53 +0200 Subject: [PATCH 013/106] feat: add recalbox package --- renovate.json | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index 8fe2bc9d10..5b618b1b1c 100644 --- a/renovate.json +++ b/renovate.json @@ -27,6 +27,14 @@ "commitMessagePrefix": "chore:", "commitMessageAction": "bump", "commitMessageLowerCase": "auto" + }, + { + "matchPackagePatterns": ["/recalbox/"], + "enabled": true, + "labels": ["renovate", "Components::System"], + "commitMessagePrefix": "chore:", + "commitMessageAction": "bump", + "commitMessageLowerCase": "auto" } ], "customManagers": [ @@ -38,13 +46,13 @@ ".*_VERSION = (?v\\d+\\.\\d+\\.\\d)\n", ".*_VERSION = (?\\d+\\.\\d+\\.\\d)\n", ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = https:\\/\\/github\\.com\\/(?.*)\\/(?.*?)\\.git\\n", - ".*_SITE = https:\\/\\/github\\.com\\/(?.*)\\/(?.*?)\\n", - ".*_SITE = .* github,(?.*),(?.*),.*?\\n" + ".*_SITE = https:\\/\\/(?git.*)\\.com\\/(?.*)\\/(?.*?)\\.git\\n", + ".*_SITE = https:\\/\\/(?git.*)\\.com\\/(?.*)\\/(?.*?)\\n", + ".*_SITE = .* (?git.*),(?.*),(?.*),.*?\\n" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", - "packageNameTemplate": "https://github.com/{{{orgName}}}/{{{depName}}}", + "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" } ] -- GitLab From 07f2be5af87e6498faf78b17d2ce37a0889ee5bd Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 19:31:10 +0200 Subject: [PATCH 014/106] fix: pipeline --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 8f2bbeff3d..ba21c49621 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,6 @@ image: docker:latest - master - merge_requests - tags - - $CI_MERGE_REQUEST_LABELS !=~ /renovate/ stages: - lint -- GitLab From c4c8e3f858a73a59c241e0a125bb5de12af14ddf Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 22:47:48 +0200 Subject: [PATCH 015/106] fix: better regexp --- renovate.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/renovate.json b/renovate.json index 5b618b1b1c..dfbe260933 100644 --- a/renovate.json +++ b/renovate.json @@ -43,12 +43,9 @@ "fileMatch": ["\\.mk$"], "matchStringsStrategy": "combination", "matchStrings": [ - ".*_VERSION = (?v\\d+\\.\\d+\\.\\d)\n", - ".*_VERSION = (?\\d+\\.\\d+\\.\\d)\n", + ".*_VERSION = (?(?:v)?[0-9\\.]*)\\n", ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = https:\\/\\/(?git.*)\\.com\\/(?.*)\\/(?.*?)\\.git\\n", - ".*_SITE = https:\\/\\/(?git.*)\\.com\\/(?.*)\\/(?.*?)\\n", - ".*_SITE = .* (?git.*),(?.*),(?.*),.*?\\n" + ".*_SITE = .*(?git.*)(?:\\.com)?.(?[\w_-]*).(?[\w_-]*)" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", -- GitLab From 12453ed22b59b1956bf1376eb5020644b8627f5d Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 23:14:16 +0200 Subject: [PATCH 016/106] fix: better regexp 2 --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index dfbe260933..2c677d6b24 100644 --- a/renovate.json +++ b/renovate.json @@ -45,7 +45,7 @@ "matchStrings": [ ".*_VERSION = (?(?:v)?[0-9\\.]*)\\n", ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = .*(?git.*)(?:\\.com)?.(?[\w_-]*).(?[\w_-]*)" + ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\w-]*)(?:\.com)?.(?[\w_-]*).(?[\w_\\/-]*)" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", -- GitLab From 5963d59c9dbebf2aba36ad0a1004f2622087ebab Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 23:18:59 +0200 Subject: [PATCH 017/106] fix: regexp error --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 2c677d6b24..017092654f 100644 --- a/renovate.json +++ b/renovate.json @@ -45,7 +45,7 @@ "matchStrings": [ ".*_VERSION = (?(?:v)?[0-9\\.]*)\\n", ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\w-]*)(?:\.com)?.(?[\w_-]*).(?[\w_\\/-]*)" + ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", -- GitLab From dd909e1190683b9a24393ad3f965bcee1924eceb Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 7 Aug 2024 23:22:28 +0200 Subject: [PATCH 018/106] fix: regexp error --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 017092654f..719d55eaac 100644 --- a/renovate.json +++ b/renovate.json @@ -45,7 +45,7 @@ "matchStrings": [ ".*_VERSION = (?(?:v)?[0-9\\.]*)\\n", ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" + ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", -- GitLab From 89094d5c745ba12ee67c7edcbea194b37089340d Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 8 Aug 2024 00:05:13 +0200 Subject: [PATCH 019/106] fix: add support of github-tags --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 719d55eaac..e42810d084 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,7 @@ "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", - "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" + "datasourceTemplate": "{{{{#if currentDigest }}git-refs{{/if}}{{#if (and currentValue containsString siteName 'github')}}github-tags{{else}}git-tags{{/if}}" } ] } -- GitLab From 82f6b7f6180e14a3e7c8ad2ce7351a890ac40ed2 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 8 Aug 2024 00:16:21 +0200 Subject: [PATCH 020/106] fix: add support of github-tags --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index e42810d084..cffda829a4 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,7 @@ "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", - "datasourceTemplate": "{{{{#if currentDigest }}git-refs{{/if}}{{#if (and currentValue containsString siteName 'github')}}github-tags{{else}}git-tags{{/if}}" + "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}{{#if (equals siteName 'github')}}github-tags{{else}}git-tags{{/if}}{{/if}}" } ] } -- GitLab From 6ec237ba82553ef345babeb460bcdcab24e129de Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 8 Aug 2024 00:25:02 +0200 Subject: [PATCH 021/106] fix: add support of github-releases --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index cffda829a4..61ccc8c4ec 100644 --- a/renovate.json +++ b/renovate.json @@ -50,7 +50,7 @@ "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{ lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", - "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}{{#if (equals siteName 'github')}}github-tags{{else}}git-tags{{/if}}{{/if}}" + "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}{{#if (equals siteName 'github')}}github-releases{{else}}git-tags{{/if}}{{/if}}" } ] } -- GitLab From 72d2282ecc1e3c8679cc90b80ae0341a7980d3e0 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 8 Aug 2024 09:27:58 +0200 Subject: [PATCH 022/106] fix: retroarch pakage --- renovate.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/renovate.json b/renovate.json index 61ccc8c4ec..e4fa421114 100644 --- a/renovate.json +++ b/renovate.json @@ -43,14 +43,14 @@ "fileMatch": ["\\.mk$"], "matchStringsStrategy": "combination", "matchStrings": [ - ".*_VERSION = (?(?:v)?[0-9\\.]*)\\n", + ".*_VERSION = (?(?:v)?[\\w+\\.\\-]*)\\n", ".*_VERSION = (?[a-f0-9]{40})\\n", ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" ], "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", - "depNameTemplate": "{{{ lowercase depName}}}", + "depNameTemplate": "{{{lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", - "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}{{#if (equals siteName 'github')}}github-releases{{else}}git-tags{{/if}}{{/if}}" + "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" } ] } -- GitLab From afd376a9e05c3f9938675115748349020c9bba66 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 12 Aug 2024 09:44:31 +0200 Subject: [PATCH 023/106] fix: add note url for compare commits --- renovate.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/renovate.json b/renovate.json index e4fa421114..eb0dcf3a98 100644 --- a/renovate.json +++ b/renovate.json @@ -15,6 +15,8 @@ "**custom/**", "**/buildroot/**", "**/libretro-retrodream/**"], + "stopUpdatingLabel": "Testing::Beta", + "prBodyNotes": ["{{#if newDigest}}[comparate {{{currentDigest}}} to {{{currentDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 66ae82aa05a14c2220a0dad930d6f5d61c34d3eb Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 12 Aug 2024 14:18:37 +0200 Subject: [PATCH 024/106] fix: add note and fix text --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index eb0dcf3a98..c3551c091d 100644 --- a/renovate.json +++ b/renovate.json @@ -16,7 +16,7 @@ "**/buildroot/**", "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", - "prBodyNotes": ["{{#if newDigest}}[comparate {{{currentDigest}}} to {{{currentDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], + "prBodyNotes": ["{{#if newDigest}}[:note: Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}):note:{{/if}}"], "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 307ae9d55c1bb16d53d5a57b01cb4171497ce3e3 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 12 Aug 2024 14:33:16 +0200 Subject: [PATCH 025/106] fix: update changelog --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index c3551c091d..79477653b4 100644 --- a/renovate.json +++ b/renovate.json @@ -16,7 +16,7 @@ "**/buildroot/**", "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", - "prBodyNotes": ["{{#if newDigest}}[:note: Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}):note:{{/if}}"], + "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelo**\n>\n>[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From a42bdb59b07706c464a003e62e9bcb778512b03c Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 12 Aug 2024 14:35:49 +0200 Subject: [PATCH 026/106] fix: update changelog --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 79477653b4..dc76244e63 100644 --- a/renovate.json +++ b/renovate.json @@ -16,7 +16,7 @@ "**/buildroot/**", "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", - "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelo**\n>\n>[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], + "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**\\n>\\n>[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 0768e19a0ebf65bc53d012d66edbfa8118a3c6ea Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 12 Aug 2024 14:41:23 +0200 Subject: [PATCH 027/106] fix: update changelog --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index dc76244e63..16dff538ed 100644 --- a/renovate.json +++ b/renovate.json @@ -16,7 +16,7 @@ "**/buildroot/**", "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", - "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**\\n>\\n>[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], + "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog* [Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 96252b79a49a01953a9695caf670bccd367f59c7 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 12 Aug 2024 14:46:03 +0200 Subject: [PATCH 028/106] fix: update changelog --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 16dff538ed..ee40a24367 100644 --- a/renovate.json +++ b/renovate.json @@ -16,7 +16,7 @@ "**/buildroot/**", "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", - "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog* [Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], + "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 74b12ecd935e1baf91ea4852b1e39c3bf9d20143 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Tue, 13 Aug 2024 09:13:45 +0200 Subject: [PATCH 029/106] fix: main branch for some packages --- renovate.json | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index ee40a24367..6815eed3ab 100644 --- a/renovate.json +++ b/renovate.json @@ -53,6 +53,24 @@ "depNameTemplate": "{{{lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" - } + }, + { + "customType": "regex", + "fileMatch": [ + "libretro-arduous\\.mk", + "libretro-gearcoleco\\.mk", + "libretro-genesisplusgxwide\\.mk", + "libretro-swanstation\\.mk" + ], + "matchStringsStrategy": "combination", + "matchStrings": [ + ".*_VERSION = (?(?:v)?[\\w+\\.\\-]*)\\n", + ".*_VERSION = (?[a-f0-9]{40})\\n", + ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" + ], + "currentValueTemplate": "{{#if currentDigest }}main{{else}}{{{currentValue}}}{{/if}}", + "depNameTemplate": "{{{lowercase depName}}}", + "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", + "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" ] } -- GitLab From 28aca6f1717692d71305eb8b06eab622b8f1bc9e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Tue, 13 Aug 2024 09:16:48 +0200 Subject: [PATCH 030/106] fix: typo --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index 6815eed3ab..2b36de0a57 100644 --- a/renovate.json +++ b/renovate.json @@ -72,5 +72,6 @@ "depNameTemplate": "{{{lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" + } ] } -- GitLab From 3e29425aff8cc239a76938e1b588d34f07866798 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:14:18 +0200 Subject: [PATCH 031/106] feat: add build package test stage --- .gitlab-ci.yml | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ba21c49621..eb843c8dc7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -179,6 +179,28 @@ appimage-amd64: - 'projects/frontend/*.AppImage*' expire_in: 1 week +build_new_package: + <<: *only-default + variables: + ARCH: 'x86_64' + before_script: + - apk update && apk add git bash + - source scripts/release/functions.sh + script: + - export files=(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) + - export package_name=(basename $file | cut -d'.' -f1) + - print $package_name + # Version generation + - set -euo pipefail + - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" + - cp "${YOUTUBE_API_KEYS}" "./api_keys.json" + fi + # Build + - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" + - mkdir -p ${OUTPUTDIR} + - docker build -t "recalbox-${ARCH}" . + - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" make $package_name 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + - echo $? include: - project: 'renovate-bot/renovate-runner' -- GitLab From 7b12466326bc1d6e0d1f4f8ce947789a1d4a4004 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:15:45 +0200 Subject: [PATCH 032/106] fix: stage --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index eb843c8dc7..f744b21aed 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,6 +180,7 @@ appimage-amd64: expire_in: 1 week build_new_package: + stage: build <<: *only-default variables: ARCH: 'x86_64' -- GitLab From fcbac259876aece99fccd5ff4a7508d3995cdd77 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:17:05 +0200 Subject: [PATCH 033/106] fix: only if mk change --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f744b21aed..ae99d66416 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -184,6 +184,11 @@ build_new_package: <<: *only-default variables: ARCH: 'x86_64' + only: + refs: + - merge_requests + changes: + - package/*/*.mk before_script: - apk update && apk add git bash - source scripts/release/functions.sh -- GitLab From 1ad10bb2d957ffad71428597e84a152aeff78218 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:21:27 +0200 Subject: [PATCH 034/106] fix: only if mk change --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ae99d66416..7e694b8527 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,7 +181,6 @@ appimage-amd64: build_new_package: stage: build - <<: *only-default variables: ARCH: 'x86_64' only: -- GitLab From 14795ad1ba8135e9fde5f9bcd93e3a18b5db8d63 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:24:37 +0200 Subject: [PATCH 035/106] fix: typo --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7e694b8527..588f122e72 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -192,8 +192,8 @@ build_new_package: - apk update && apk add git bash - source scripts/release/functions.sh script: - - export files=(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - - export package_name=(basename $file | cut -d'.' -f1) + - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) + - export package_name=$(basename $file | cut -d'.' -f1) - print $package_name # Version generation - set -euo pipefail -- GitLab From 98aa0d5d34db99c5c560cd94d57d37b8757c4188 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:42:19 +0200 Subject: [PATCH 036/106] fix: typo --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 588f122e72..2ab54a5fc0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,7 +193,8 @@ build_new_package: - source scripts/release/functions.sh script: - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - - export package_name=$(basename $file | cut -d'.' -f1) + - print $files + - export package_name=$(basename $file | cut -d"." -f1) - print $package_name # Version generation - set -euo pipefail -- GitLab From f5ae6e13e38da69f636c3ba6f954fe1a652e8f4d Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:49:20 +0200 Subject: [PATCH 037/106] fix: typo --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2ab54a5fc0..174ba45764 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -193,9 +193,7 @@ build_new_package: - source scripts/release/functions.sh script: - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - - print $files - - export package_name=$(basename $file | cut -d"." -f1) - - print $package_name + - export package_name=$(basename $files | cut -d"." -f1) # Version generation - set -euo pipefail - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" -- GitLab From 1f146ab9ac5e427b03cddda529b8482bcfe59299 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 10:54:13 +0200 Subject: [PATCH 038/106] fix: remove youtube key --- .gitlab-ci.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 174ba45764..50ed51d3f0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -197,8 +197,6 @@ build_new_package: # Version generation - set -euo pipefail - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" - - cp "${YOUTUBE_API_KEYS}" "./api_keys.json" - fi # Build - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} -- GitLab From a50dfea9b737f92cc7d6df9a66511a57ae3ceee4 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 26 Aug 2024 11:15:10 +0200 Subject: [PATCH 039/106] fix: add tag build --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50ed51d3f0..0bfd5c5656 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -203,6 +203,8 @@ build_new_package: - docker build -t "recalbox-${ARCH}" . - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" make $package_name 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - echo $? + tags: + - build include: - project: 'renovate-bot/renovate-runner' -- GitLab From 049046bc538e71021ee85d05cd2f281c5e0ad60d Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 30 Aug 2024 11:39:43 +0200 Subject: [PATCH 040/106] fix: remove some token --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0bfd5c5656..ca57d1ae51 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -201,7 +201,7 @@ build_new_package: - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} - docker build -t "recalbox-${ARCH}" . - - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "GITLAB_TOKEN_RB5000=${GITLAB_TOKEN_RB5000}" -e "GITLAB_TOKEN_BEEBEM=${GITLAB_TOKEN_BEEBEM}" -e "GITLAB_TOKEN_THEMES=${GITLAB_TOKEN_THEMES}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" make $package_name 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" make $package_name 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - echo $? tags: - build -- GitLab From 4f88430164e95ccedbc9ae98f9268f6b4ce985c0 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 30 Aug 2024 17:50:25 +0200 Subject: [PATCH 041/106] fix: new package build --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca57d1ae51..adc58da9de 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -183,6 +183,7 @@ build_new_package: stage: build variables: ARCH: 'x86_64' + RUNNER_SCRIPT_TIMEOUT: 3h only: refs: - merge_requests @@ -201,7 +202,7 @@ build_new_package: - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} - docker build -t "recalbox-${ARCH}" . - - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" "recalbox-${ARCH}" make $package_name 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - echo $? tags: - build -- GitLab From a974512dfabb261201500f18c3b0b4f8640ecf6b Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sat, 31 Aug 2024 08:31:37 +0200 Subject: [PATCH 042/106] fix: rate limiting --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 2b36de0a57..4cd84fbed1 100644 --- a/renovate.json +++ b/renovate.json @@ -3,8 +3,7 @@ "extends": [ "config:recommended", ":dependencyDashboard", - ":rebaseStalePrs", - ":disableRateLimiting" + ":rebaseStalePrs" ], "labels": ["renovate"], "lockFileMaintenance": {"enabled": false}, @@ -17,6 +16,7 @@ "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], + "prHourlyLimit": 4, "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 9bd2d2359a35e5b67e4caedf4508cbe7bf59dfc2 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sat, 31 Aug 2024 08:37:59 +0200 Subject: [PATCH 043/106] fix: rate limiting --- renovate.json | 1 + 1 file changed, 1 insertion(+) diff --git a/renovate.json b/renovate.json index 4cd84fbed1..2148a505f5 100644 --- a/renovate.json +++ b/renovate.json @@ -17,6 +17,7 @@ "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "prHourlyLimit": 4, + "prConcurrentLimit": 4, "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From e6941ff8714b03cc490b22c08add8f42c8bc8ef1 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sun, 1 Sep 2024 15:48:11 +0200 Subject: [PATCH 044/106] fix: rate limiting --- renovate.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 2148a505f5..d6af7e03d9 100644 --- a/renovate.json +++ b/renovate.json @@ -16,8 +16,9 @@ "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], - "prHourlyLimit": 4, - "prConcurrentLimit": 4, + "prHourlyLimitNone": { + "prHourlyLimit": 4 + }, "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From 063037df7299e32d304b7d37e554b81462850e37 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sun, 1 Sep 2024 15:50:57 +0200 Subject: [PATCH 045/106] fix: rate limiting --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index d6af7e03d9..4603ad2fa6 100644 --- a/renovate.json +++ b/renovate.json @@ -16,7 +16,7 @@ "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], - "prHourlyLimitNone": { + "prHourlyLimit1": { "prHourlyLimit": 4 }, "packageRules": [ -- GitLab From dcea5653787d9e33a3212d86cdfec71ea3519dc5 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sun, 1 Sep 2024 15:57:10 +0200 Subject: [PATCH 046/106] fix: rate limiting --- renovate.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index 4603ad2fa6..623eca345e 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,7 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:recommended", + "config:base", ":dependencyDashboard", ":rebaseStalePrs" ], @@ -16,9 +16,7 @@ "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], - "prHourlyLimit1": { - "prHourlyLimit": 4 - }, + "prHourlyLimit": 4, "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From a3b0e9cb3dc6b8fb108a77fa526f94df8278a0da Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Sun, 1 Sep 2024 16:01:41 +0200 Subject: [PATCH 047/106] fix: rate limiting --- renovate.json | 1 - 1 file changed, 1 deletion(-) diff --git a/renovate.json b/renovate.json index 623eca345e..0ee7d2e7ce 100644 --- a/renovate.json +++ b/renovate.json @@ -1,7 +1,6 @@ { "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ - "config:base", ":dependencyDashboard", ":rebaseStalePrs" ], -- GitLab From 4ee70853e189650b380af29e11977f61ed7315b8 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 09:05:26 +0200 Subject: [PATCH 048/106] fix: rate limiting --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 0ee7d2e7ce..fbd6457880 100644 --- a/renovate.json +++ b/renovate.json @@ -15,7 +15,7 @@ "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], - "prHourlyLimit": 4, + "prHourlyLimit": 6, "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From daba88c791102f747b668b51386a4966a809bf61 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 14:52:48 +0200 Subject: [PATCH 049/106] fix: force create mr only after validae in dashboard --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index fbd6457880..dd7f4e9d6a 100644 --- a/renovate.json +++ b/renovate.json @@ -15,7 +15,7 @@ "**/libretro-retrodream/**"], "stopUpdatingLabel": "Testing::Beta", "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], - "prHourlyLimit": 6, + "prCreation": "approval", "packageRules": [ { "matchPackagePatterns": ["*"], -- GitLab From f7dbf6beeb9f32c132c6325780fad43481228667 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 16:11:25 +0200 Subject: [PATCH 050/106] fix: force find branch --- package/libretro-arduous/libretro-arduous.mk | 2 +- .../libretro-gearcoleco.mk | 2 +- .../libretro-genesisplusgxwide.mk | 2 +- .../libretro-swanstation.mk | 2 +- renovate.json | 24 +++---------------- 5 files changed, 7 insertions(+), 25 deletions(-) diff --git a/package/libretro-arduous/libretro-arduous.mk b/package/libretro-arduous/libretro-arduous.mk index 232cc83324..f861b2e9c9 100644 --- a/package/libretro-arduous/libretro-arduous.mk +++ b/package/libretro-arduous/libretro-arduous.mk @@ -5,7 +5,7 @@ ################################################################################ # Commit version of 2022/05/24 -LIBRETRO_ARDUOUS_VERSION = aed50506962df6f965748e888b3fe7027ddb410d +LIBRETRO_ARDUOUS_VERSION = aed50506962df6f965748e888b3fe7027ddb410d #main LIBRETRO_ARDUOUS_SITE = https://github.com/libretro/arduous.git LIBRETRO_ARDUOUS_SITE_METHOD = git LIBRETRO_ARDUOUS_GIT_SUBMODULES = YES diff --git a/package/libretro-gearcoleco/libretro-gearcoleco.mk b/package/libretro-gearcoleco/libretro-gearcoleco.mk index 3320a74ddc..e86e8670e3 100644 --- a/package/libretro-gearcoleco/libretro-gearcoleco.mk +++ b/package/libretro-gearcoleco/libretro-gearcoleco.mk @@ -5,7 +5,7 @@ ################################################################################ # Commit of 2023/08/23 -LIBRETRO_GEARCOLECO_VERSION = cc7c19c776a12d149c2c935e2198ddad15f22f54 +LIBRETRO_GEARCOLECO_VERSION = cc7c19c776a12d149c2c935e2198ddad15f22f54 #main LIBRETRO_GEARCOLECO_SITE = $(call gitlab,recalbox,packages/libretro/Gearcoleco,$(LIBRETRO_GEARCOLECO_VERSION)) LIBRETRO_GEARCOLECO_LICENSE = GPL-3.0 LIBRETRO_GEARCOLECO_LICENSE_FILES = LICENSE diff --git a/package/libretro-genesisplusgxwide/libretro-genesisplusgxwide.mk b/package/libretro-genesisplusgxwide/libretro-genesisplusgxwide.mk index 6ad0094cd0..2996b66f44 100644 --- a/package/libretro-genesisplusgxwide/libretro-genesisplusgxwide.mk +++ b/package/libretro-genesisplusgxwide/libretro-genesisplusgxwide.mk @@ -5,7 +5,7 @@ ################################################################################ # Commit of 2023/09/16 -LIBRETRO_GENESISPLUSGXWIDE_VERSION = f73cf1b0769127cee137a559f1c132b24c147923 +LIBRETRO_GENESISPLUSGXWIDE_VERSION = f73cf1b0769127cee137a559f1c132b24c147923 #main LIBRETRO_GENESISPLUSGXWIDE_SITE = $(call github,libretro,Genesis-Plus-GX-Wide,$(LIBRETRO_GENESISPLUSGXWIDE_VERSION)) LIBRETRO_GENESISPLUSGXWIDE_LICENSE = COPYRIGHT LIBRETRO_GENESISPLUSGXWIDE_LICENSE_FILES = LICENSE.txt diff --git a/package/libretro-swanstation/libretro-swanstation.mk b/package/libretro-swanstation/libretro-swanstation.mk index 94c3fc7a7a..4cf138e10d 100644 --- a/package/libretro-swanstation/libretro-swanstation.mk +++ b/package/libretro-swanstation/libretro-swanstation.mk @@ -5,7 +5,7 @@ ################################################################################ # Commit of 2023/10/01 -LIBRETRO_SWANSTATION_VERSION = afb6bc73c7ce522190b19ec3e3c8a14eb264bdeb +LIBRETRO_SWANSTATION_VERSION = afb6bc73c7ce522190b19ec3e3c8a14eb264bdeb #main LIBRETRO_SWANSTATION_SITE = $(call github,libretro,swanstation,$(LIBRETRO_SWANSTATION_VERSION)) LIBRETRO_SWANSTATION_LICENSE = GPL-3.0 LIBRETRO_SWANSTATION_LICENSE_FILES = LICENSE diff --git a/renovate.json b/renovate.json index dd7f4e9d6a..4ccf752e72 100644 --- a/renovate.json +++ b/renovate.json @@ -46,28 +46,10 @@ "matchStrings": [ ".*_VERSION = (?(?:v)?[\\w+\\.\\-]*)\\n", ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" + ".*_VERSION = (?[a-f0-9]{40}) #(?.*)\\n", + ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*) #(?.*)" ], - "currentValueTemplate": "{{#if currentDigest }}master{{else}}{{{currentValue}}}{{/if}}", - "depNameTemplate": "{{{lowercase depName}}}", - "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", - "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" - }, - { - "customType": "regex", - "fileMatch": [ - "libretro-arduous\\.mk", - "libretro-gearcoleco\\.mk", - "libretro-genesisplusgxwide\\.mk", - "libretro-swanstation\\.mk" - ], - "matchStringsStrategy": "combination", - "matchStrings": [ - ".*_VERSION = (?(?:v)?[\\w+\\.\\-]*)\\n", - ".*_VERSION = (?[a-f0-9]{40})\\n", - ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" - ], - "currentValueTemplate": "{{#if currentDigest }}main{{else}}{{{currentValue}}}{{/if}}", + "currentValueTemplate": "{{#if currentDigest }}{{#if BranchName }}{{{branchName}}}{{else}}master{{/if}}{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" -- GitLab From da575cc306e65de37e8c4948a8ce4bcfa2dad8eb Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 16:17:53 +0200 Subject: [PATCH 051/106] fix: typo site --- renovate.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/renovate.json b/renovate.json index 4ccf752e72..b544ae5ce1 100644 --- a/renovate.json +++ b/renovate.json @@ -45,9 +45,9 @@ "matchStringsStrategy": "combination", "matchStrings": [ ".*_VERSION = (?(?:v)?[\\w+\\.\\-]*)\\n", - ".*_VERSION = (?[a-f0-9]{40})\\n", ".*_VERSION = (?[a-f0-9]{40}) #(?.*)\\n", - ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*) #(?.*)" + ".*_VERSION = (?[a-f0-9]{40})\\n", + ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" ], "currentValueTemplate": "{{#if currentDigest }}{{#if BranchName }}{{{branchName}}}{{else}}master{{/if}}{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{lowercase depName}}}", -- GitLab From 12dff96f7cde5bb1c5cededdeab17b6346a79b7e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 16:21:34 +0200 Subject: [PATCH 052/106] fix: nameBranch --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index b544ae5ce1..4d605d70b1 100644 --- a/renovate.json +++ b/renovate.json @@ -49,7 +49,7 @@ ".*_VERSION = (?[a-f0-9]{40})\\n", ".*_SITE = (?:https?:\\/\\/)?(?:.*call )?(?[\\w-]*)(?:\\.com)?.(?[\\w_-]*).(?[\\w_\\/-]*)" ], - "currentValueTemplate": "{{#if currentDigest }}{{#if BranchName }}{{{branchName}}}{{else}}master{{/if}}{{else}}{{{currentValue}}}{{/if}}", + "currentValueTemplate": "{{#if currentDigest }}{{#if nameBranch }}{{{nameBranch}}}{{else}}master{{/if}}{{else}}{{{currentValue}}}{{/if}}", "depNameTemplate": "{{{lowercase depName}}}", "packageNameTemplate": "https://{{{siteName}}}.com/{{{orgName}}}/{{{depName}}}", "datasourceTemplate": "{{#if currentDigest }}git-refs{{else}}git-tags{{/if}}" -- GitLab From d79eac9a46b7b507238301a1d85520f1d0a9a242 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 16:34:53 +0200 Subject: [PATCH 053/106] fix: remove ratelimite --- renovate.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index 4d605d70b1..23318553a0 100644 --- a/renovate.json +++ b/renovate.json @@ -2,7 +2,8 @@ "$schema": "https://docs.renovatebot.com/renovate-schema.json", "extends": [ ":dependencyDashboard", - ":rebaseStalePrs" + ":rebaseStalePrs", + ":disableRateLimiting" ], "labels": ["renovate"], "lockFileMaintenance": {"enabled": false}, -- GitLab From d8b362d2aa439364e42180a063767564ec9c9d8b Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 21:59:39 +0200 Subject: [PATCH 054/106] fix: build all arch --- .gitlab-ci.yml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index adc58da9de..18823879ad 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -179,10 +179,9 @@ appimage-amd64: - 'projects/frontend/*.AppImage*' expire_in: 1 week -build_new_package: +.package_template: stage: build variables: - ARCH: 'x86_64' RUNNER_SCRIPT_TIMEOUT: 3h only: refs: @@ -207,6 +206,21 @@ build_new_package: tags: - build +build_package: + extends: .package_template + parallel: + matrix: + - ARCH: + - 'x86_64' + - 'rpi4_64' + - 'odroidgo2' + - 'odroidxu4' + - 'rpi3' + - 'rpizero2legacy' + - 'rpizero2' + - 'rg353x' + - 'rpi5_64' + include: - project: 'renovate-bot/renovate-runner' file: '/templates/renovate.gitlab-ci.yml' -- GitLab From 8fb3536efe67f92321b363ce53f692aa187a96f7 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 22:14:32 +0200 Subject: [PATCH 055/106] fix: build all arch --- .gitlab-ci.yml | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18823879ad..7306d1a463 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,15 +194,20 @@ appimage-amd64: script: - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - export package_name=$(basename $files | cut -d"." -f1) - # Version generation - - set -euo pipefail - - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" - # Build - - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - - mkdir -p ${OUTPUTDIR} - - docker build -t "recalbox-${ARCH}" . - - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - - echo $? + - export PACKAGE_BL=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '/\-/' '/\_/') + - |- + if grep -q "$PACKAGE_BL" configs/recalbox-${ARCH}_defconfig;then + set -euo pipefail + export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" + Build + WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" + mkdir -p ${OUTPUTDIR} + docker build -t "recalbox-${ARCH}" . + docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + echo $? + else + echo "$PACKAGE_BL not available for $ARCH" + fi tags: - build -- GitLab From 2ec50b8cb4dd882622382d6f43b4f04ddba30f1c Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 22:26:08 +0200 Subject: [PATCH 056/106] fix: build all arch --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7306d1a463..82fc9d80b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,7 +194,7 @@ appimage-amd64: script: - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - export package_name=$(basename $files | cut -d"." -f1) - - export PACKAGE_BL=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '/\-/' '/\_/') + - export PACKAGE_BL=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '-' '_') - |- if grep -q "$PACKAGE_BL" configs/recalbox-${ARCH}_defconfig;then set -euo pipefail -- GitLab From cfc9ccca3c452df17d93730256416c781ea30e6e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 22:26:59 +0200 Subject: [PATCH 057/106] fix: build all arch --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 82fc9d80b3..b5c42dfaf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -16,6 +16,7 @@ stages: - build - release - deploy + - test variables: GIT_SUBMODULE_STRATEGY: none @@ -180,7 +181,7 @@ appimage-amd64: expire_in: 1 week .package_template: - stage: build + stage: test variables: RUNNER_SCRIPT_TIMEOUT: 3h only: -- GitLab From a515863fc68289ba5163a90b34ffa8ad531d902e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 22:32:43 +0200 Subject: [PATCH 058/106] fix: typo --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b5c42dfaf9..c0ef6e06b3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -200,7 +200,6 @@ appimage-amd64: if grep -q "$PACKAGE_BL" configs/recalbox-${ARCH}_defconfig;then set -euo pipefail export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" - Build WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" mkdir -p ${OUTPUTDIR} docker build -t "recalbox-${ARCH}" . -- GitLab From 5b355aded554b382197401fe60dd0b2df1800d18 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Mon, 2 Sep 2024 22:33:12 +0200 Subject: [PATCH 059/106] fix: typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c0ef6e06b3..a7de84f566 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,10 +13,10 @@ image: docker:latest stages: - lint + - test - build - release - deploy - - test variables: GIT_SUBMODULE_STRATEGY: none -- GitLab From 097ad64f4ddba7c315499b1a632cdf844f873222 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Wed, 4 Sep 2024 21:34:07 +0200 Subject: [PATCH 060/106] fix: check patch --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a7de84f566..6bdcb8111c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -114,6 +114,7 @@ tests buildroot patches: refs: - merge_requests changes: + - package/*/*.mk - package/*/*.patch - board/recalbox/patches/*/*.patch before_script: -- GitLab From 7095a1f1fb347417873e1183a617e4aa9765a676 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 10:49:29 +0200 Subject: [PATCH 061/106] feat: try dynamic child pipeline --- .gitlab-ci.yml | 81 +++++++++++++++++++++++++++++--------------- generated-config.tpl | 6 ++++ 2 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 generated-config.tpl diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6bdcb8111c..a0d43b6311 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -181,6 +181,45 @@ appimage-amd64: - 'projects/frontend/*.AppImage*' expire_in: 1 week + +check_package: + stage: check + only: + refs: + - merge_requests + changes: + - package/*/*.mk + script: + - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) + - export package_name=$(basename $files | cut -d"." -f1) + - export package_bl=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '-' '_') + - echo "package_name=$package_name" >> build.env + - |- + for ARCH in ARCHS + do + if grep -q "$package_bl" configs/recalbox-${ARCH}_defconfig;then + cp generated-config.tpl generated-config.yml + echo " - \'$ARCH\' >> generated-config.yml" + fi + done + variables: + ARCHS: > + x86_64 + rpi4_64 + odroidgo2 + odroidxu4 + rpi3 + rpizero2legacy + rpizero2 + rg353x + rpi5_64 + artifacts: + paths: + generated-config.yml + reports: + dotenv: build.env + + .package_template: stage: test variables: @@ -188,44 +227,30 @@ appimage-amd64: only: refs: - merge_requests + variables: + - '$PACKAGE_BL == "y"' changes: - package/*/*.mk before_script: - apk update && apk add git bash - source scripts/release/functions.sh script: - - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - - export package_name=$(basename $files | cut -d"." -f1) - - export PACKAGE_BL=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '-' '_') - - |- - if grep -q "$PACKAGE_BL" configs/recalbox-${ARCH}_defconfig;then - set -euo pipefail - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} - docker build -t "recalbox-${ARCH}" . - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - echo $? - else - echo "$PACKAGE_BL not available for $ARCH" - fi + - set -euo pipefail + - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" + - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" + - mkdir -p ${OUTPUTDIR} + - docker build -t "recalbox-${ARCH}" . + - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + - echo $? tags: - build build_package: - extends: .package_template - parallel: - matrix: - - ARCH: - - 'x86_64' - - 'rpi4_64' - - 'odroidgo2' - - 'odroidxu4' - - 'rpi3' - - 'rpizero2legacy' - - 'rpizero2' - - 'rg353x' - - 'rpi5_64' + stage: test + trigger: + include: + - artifact: build_package + job: generate-config include: - project: 'renovate-bot/renovate-runner' diff --git a/generated-config.tpl b/generated-config.tpl new file mode 100644 index 0000000000..a42c0b6cb9 --- /dev/null +++ b/generated-config.tpl @@ -0,0 +1,6 @@ +build_package: + extends: .package_template + parallel: + matrix: + - ARCH: + -- GitLab From 61d2fd043983ef7271b536de74b1bc5d0ff5bde4 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 10:51:22 +0200 Subject: [PATCH 062/106] fix: typo --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a0d43b6311..75f5e1f6eb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,6 +13,7 @@ image: docker:latest stages: - lint + - check - test - build - release @@ -215,7 +216,7 @@ check_package: rpi5_64 artifacts: paths: - generated-config.yml + - generated-config.yml reports: dotenv: build.env -- GitLab From 4dc87d2cb2852cee10a7444ddeb2dda65821be70 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 10:52:59 +0200 Subject: [PATCH 063/106] fix: typo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75f5e1f6eb..0e6771c74e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -251,7 +251,7 @@ build_package: trigger: include: - artifact: build_package - job: generate-config + job: check_package include: - project: 'renovate-bot/renovate-runner' -- GitLab From 51e984131cc60f8fd70a3612842d99fe5cf9e81e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 10:58:02 +0200 Subject: [PATCH 064/106] fix: rules --- .gitlab-ci.yml | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e6771c74e..73f7a5dbcd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,8 +228,6 @@ check_package: only: refs: - merge_requests - variables: - - '$PACKAGE_BL == "y"' changes: - package/*/*.mk before_script: @@ -252,6 +250,11 @@ build_package: include: - artifact: build_package job: check_package + only: + refs: + - merge_requests + changes: + - package/*/*.mk include: - project: 'renovate-bot/renovate-runner' -- GitLab From 770ceeffbb457e5e3d4b39f17ce38970d880c6a3 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:02:18 +0200 Subject: [PATCH 065/106] fix: add execpt scedule --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73f7a5dbcd..bbbb295379 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,6 +10,8 @@ image: docker:latest - master - merge_requests - tags + except: + - schedules stages: - lint -- GitLab From 9dc3e85f1b2104395afb56542b44e773f8c14ec6 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:04:12 +0200 Subject: [PATCH 066/106] fix: for --- .gitlab-ci.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bbbb295379..9f89c4fcc3 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -198,24 +198,13 @@ check_package: - export package_bl=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '-' '_') - echo "package_name=$package_name" >> build.env - |- - for ARCH in ARCHS + for ARCH in x86_64 rpi4_64 odroidgo2 odroidxu4 rpi3 rpizero2legacy rpizero2 rg353x rpi5_64 do if grep -q "$package_bl" configs/recalbox-${ARCH}_defconfig;then cp generated-config.tpl generated-config.yml echo " - \'$ARCH\' >> generated-config.yml" fi done - variables: - ARCHS: > - x86_64 - rpi4_64 - odroidgo2 - odroidxu4 - rpi3 - rpizero2legacy - rpizero2 - rg353x - rpi5_64 artifacts: paths: - generated-config.yml -- GitLab From 8b941e8a4523f9007d5a6770a2e4602741cab420 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:33:40 +0200 Subject: [PATCH 067/106] fix: generate yml --- .gitlab-ci.yml | 2 +- generated-config.tpl | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f89c4fcc3..6fa09b14c4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,7 +202,7 @@ check_package: do if grep -q "$package_bl" configs/recalbox-${ARCH}_defconfig;then cp generated-config.tpl generated-config.yml - echo " - \'$ARCH\' >> generated-config.yml" + echo " - '$ARCH'" >> generated-config.yml fi done artifacts: diff --git a/generated-config.tpl b/generated-config.tpl index a42c0b6cb9..679b3c6328 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -3,4 +3,3 @@ build_package: parallel: matrix: - ARCH: - -- GitLab From d346fc9d02b33c47edd47dfb587a2487b92d2c7f Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:34:07 +0200 Subject: [PATCH 068/106] fix: generate yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6fa09b14c4..685f9d52dd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,7 +202,7 @@ check_package: do if grep -q "$package_bl" configs/recalbox-${ARCH}_defconfig;then cp generated-config.tpl generated-config.yml - echo " - '$ARCH'" >> generated-config.yml + echo -n " - '$ARCH'" >> generated-config.yml fi done artifacts: -- GitLab From 6c4f408a3911a8afe25c54662c09021253b940d9 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:38:51 +0200 Subject: [PATCH 069/106] fix: generate yml --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 685f9d52dd..bd99818bb5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -239,7 +239,7 @@ build_package: stage: test trigger: include: - - artifact: build_package + - artifact: generated-config.yml job: check_package only: refs: -- GitLab From d58f41091771c14c8c940f0cccc5ee9d9cd05e30 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:46:48 +0200 Subject: [PATCH 070/106] fix: no more extends --- .gitlab-ci.yml | 24 ------------------------ generated-config.tpl | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bd99818bb5..5130a71ae1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -211,30 +211,6 @@ check_package: reports: dotenv: build.env - -.package_template: - stage: test - variables: - RUNNER_SCRIPT_TIMEOUT: 3h - only: - refs: - - merge_requests - changes: - - package/*/*.mk - before_script: - - apk update && apk add git bash - - source scripts/release/functions.sh - script: - - set -euo pipefail - - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" - - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - - mkdir -p ${OUTPUTDIR} - - docker build -t "recalbox-${ARCH}" . - - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - - echo $? - tags: - - build - build_package: stage: test trigger: diff --git a/generated-config.tpl b/generated-config.tpl index 679b3c6328..ec2c3be76e 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -1,5 +1,21 @@ build_package: - extends: .package_template + image: docker:latest + stage: test + variables: + RUNNER_SCRIPT_TIMEOUT: 3h + before_script: + - apk update && apk add git bash + - source scripts/release/functions.sh + script: + - set -euo pipefail + - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" + - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" + - mkdir -p ${OUTPUTDIR} + - docker build -t "recalbox-${ARCH}" . + - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + - echo $? + tags: + - build parallel: matrix: - ARCH: -- GitLab From 2ff1dbe8316016315eeddcd80884f040bd6400d1 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 11:53:28 +0200 Subject: [PATCH 071/106] fix: change job name --- generated-config.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generated-config.tpl b/generated-config.tpl index ec2c3be76e..4144c71917 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -1,4 +1,4 @@ -build_package: +child_build_package: image: docker:latest stage: test variables: -- GitLab From 9e47ebdcce540e0dcb31bebd19cfafe1e3a94135 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 12:47:30 +0200 Subject: [PATCH 072/106] feat: try child --- .gitlab-ci.yml | 2 +- generated-config.tpl | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5130a71ae1..031af1d6e1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -197,11 +197,11 @@ check_package: - export package_name=$(basename $files | cut -d"." -f1) - export package_bl=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '-' '_') - echo "package_name=$package_name" >> build.env + - cp generated-config.tpl generated-config.yml - |- for ARCH in x86_64 rpi4_64 odroidgo2 odroidxu4 rpi3 rpizero2legacy rpizero2 rg353x rpi5_64 do if grep -q "$package_bl" configs/recalbox-${ARCH}_defconfig;then - cp generated-config.tpl generated-config.yml echo -n " - '$ARCH'" >> generated-config.yml fi done diff --git a/generated-config.tpl b/generated-config.tpl index 4144c71917..76aee1a965 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -1,6 +1,5 @@ -child_build_package: +build_package: image: docker:latest - stage: test variables: RUNNER_SCRIPT_TIMEOUT: 3h before_script: -- GitLab From 0d0aa8bd8d99802423f75629b8ea2b2ca6a7d067 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 12:50:51 +0200 Subject: [PATCH 073/106] fix: echo --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 031af1d6e1..a13bb4bd94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -202,7 +202,7 @@ check_package: for ARCH in x86_64 rpi4_64 odroidgo2 odroidxu4 rpi3 rpizero2legacy rpizero2 rg353x rpi5_64 do if grep -q "$package_bl" configs/recalbox-${ARCH}_defconfig;then - echo -n " - '$ARCH'" >> generated-config.yml + echo " - '$ARCH'" >> generated-config.yml fi done artifacts: -- GitLab From f829960d999b6f6efa7850315c402a6dbadeedc2 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 12:56:23 +0200 Subject: [PATCH 074/106] fix: rules --- .gitlab-ci.yml | 2 -- generated-config.tpl | 5 +++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a13bb4bd94..145de1fd39 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,8 +10,6 @@ image: docker:latest - master - merge_requests - tags - except: - - schedules stages: - lint diff --git a/generated-config.tpl b/generated-config.tpl index 76aee1a965..1ff7189d54 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -15,6 +15,11 @@ build_package: - echo $? tags: - build + only: + refs: + - merge_requests + changes: + - package/*/*.mk parallel: matrix: - ARCH: -- GitLab From 2142d1147d8796c013c8e07fa2d980ab11549825 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:03:01 +0200 Subject: [PATCH 075/106] fix: rules --- .gitlab-ci.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 145de1fd39..88f2b1d097 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,11 +215,6 @@ build_package: include: - artifact: generated-config.yml job: check_package - only: - refs: - - merge_requests - changes: - - package/*/*.mk include: - project: 'renovate-bot/renovate-runner' -- GitLab From 778470752d025ed05f93f9a130edea56bb59beee Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:08:16 +0200 Subject: [PATCH 076/106] fix: rules --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 88f2b1d097..44d5dabfb1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,6 +215,8 @@ build_package: include: - artifact: generated-config.yml job: check_package + dependencies: + - check_package include: - project: 'renovate-bot/renovate-runner' -- GitLab From b6794fa14a7820e749af97c6eaaa3f2c14d22074 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:10:31 +0200 Subject: [PATCH 077/106] fix: rules --- .gitlab-ci.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 44d5dabfb1..37e026b6d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -209,14 +209,17 @@ check_package: reports: dotenv: build.env -build_package: +trigger_build: stage: test trigger: include: - artifact: generated-config.yml job: check_package - dependencies: - - check_package + only: + refs: + - merge_requests + changes: + - package/*/*.mk include: - project: 'renovate-bot/renovate-runner' -- GitLab From b905f0296e6473195c36f4a6c871c4b22236807e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:16:39 +0200 Subject: [PATCH 078/106] fix: add workflow --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37e026b6d1..ad1f909080 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,10 @@ image: docker:latest +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + .only-default: &only-default only: - master -- GitLab From bfe1da0bef47d5ca371fb838823d8f3b1dd551ca Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:29:33 +0200 Subject: [PATCH 079/106] fix: add workflow --- .gitlab-ci.yml | 4 ---- generated-config.tpl | 5 +---- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ad1f909080..37e026b6d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,10 +5,6 @@ image: docker:latest -workflow: - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - .only-default: &only-default only: - master diff --git a/generated-config.tpl b/generated-config.tpl index 1ff7189d54..20849899e7 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -16,10 +16,7 @@ build_package: tags: - build only: - refs: - - merge_requests - changes: - - package/*/*.mk + - triggers parallel: matrix: - ARCH: -- GitLab From 445b1d5317d662eed6d7711dd17bdab229a99fa5 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:37:09 +0200 Subject: [PATCH 080/106] fix: rules --- .gitlab-ci.yml | 9 ++++----- generated-config.tpl | 2 -- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37e026b6d1..249009b3d2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -215,11 +215,10 @@ trigger_build: include: - artifact: generated-config.yml job: check_package - only: - refs: - - merge_requests - changes: - - package/*/*.mk + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + changes: + - package/*/*.mk include: - project: 'renovate-bot/renovate-runner' diff --git a/generated-config.tpl b/generated-config.tpl index 20849899e7..76aee1a965 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -15,8 +15,6 @@ build_package: - echo $? tags: - build - only: - - triggers parallel: matrix: - ARCH: -- GitLab From 9ae0e4211dede2a4ef11006b0ae61130769ebeed Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:37:34 +0200 Subject: [PATCH 081/106] fix: rules --- generated-config.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/generated-config.tpl b/generated-config.tpl index 76aee1a965..70eb5dd03a 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -15,6 +15,8 @@ build_package: - echo $? tags: - build + rules: + - if: $CI_PIPELINE_SOURCE == "parent_pipeline" parallel: matrix: - ARCH: -- GitLab From b70425c11275a702ad16a9e5f33bc820970971ac Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:43:30 +0200 Subject: [PATCH 082/106] fix: package name --- .gitlab-ci.yml | 3 --- generated-config.tpl | 2 ++ 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 249009b3d2..50bebe16a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -194,7 +194,6 @@ check_package: - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) - export package_name=$(basename $files | cut -d"." -f1) - export package_bl=$(echo $package_name | tr '[:lower:]' '[:upper:]' | tr '-' '_') - - echo "package_name=$package_name" >> build.env - cp generated-config.tpl generated-config.yml - |- for ARCH in x86_64 rpi4_64 odroidgo2 odroidxu4 rpi3 rpizero2legacy rpizero2 rg353x rpi5_64 @@ -206,8 +205,6 @@ check_package: artifacts: paths: - generated-config.yml - reports: - dotenv: build.env trigger_build: stage: test diff --git a/generated-config.tpl b/generated-config.tpl index 70eb5dd03a..6ccd39e5a2 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -7,6 +7,8 @@ build_package: - source scripts/release/functions.sh script: - set -euo pipefail + - export files=$(git diff-tree --no-commit-id --name-only -r $CI_COMMIT_SHA) + - export package_name=$(basename $files | cut -d"." -f1) - export RECALBOX_VERSION="${CI_COMMIT_TAG:-$(date '+%Y/%m/%d') ${CI_COMMIT_REF_SLUG} (${CI_PIPELINE_ID})}" - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} -- GitLab From 15973ee1af3c4cc44ad7eb1b4cbdacdcefe73b72 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:47:29 +0200 Subject: [PATCH 083/106] fix: add workflow --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50bebe16a6..57a309c3b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,6 +5,10 @@ image: docker:latest +workflow: + rules: + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + .only-default: &only-default only: - master -- GitLab From 73bd4dbb21c7b3d7f0c091397c47cda544737d3e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:53:19 +0200 Subject: [PATCH 084/106] fix: add strategy --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57a309c3b2..3db7f3dcf9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,6 +216,7 @@ trigger_build: include: - artifact: generated-config.yml job: check_package + strategy: depend rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: -- GitLab From 014a1b2004f39fe794a73fcf6d8a380ef5caaccb Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:53:50 +0200 Subject: [PATCH 085/106] fix: add strategy --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3db7f3dcf9..4243ad0e5e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,7 +216,7 @@ trigger_build: include: - artifact: generated-config.yml job: check_package - strategy: depend + strategy: depend rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: -- GitLab From 722161124be4074ff9933e0ec6087f5fa34d6a1a Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:56:57 +0200 Subject: [PATCH 086/106] fix: remove strategy --- .gitlab-ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4243ad0e5e..57a309c3b2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -216,7 +216,6 @@ trigger_build: include: - artifact: generated-config.yml job: check_package - strategy: depend rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: -- GitLab From 58a06fc27dff40948fd7158664d2aaf37fa935e0 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 14:59:16 +0200 Subject: [PATCH 087/106] fix: remove workflow --- .gitlab-ci.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 57a309c3b2..50bebe16a6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,10 +5,6 @@ image: docker:latest -workflow: - rules: - - if: $CI_PIPELINE_SOURCE == "merge_request_event" - .only-default: &only-default only: - master -- GitLab From c0e939d9eb6014088c4a6a79689b72887598c5a6 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 5 Sep 2024 15:00:06 +0200 Subject: [PATCH 088/106] fix: add strategy --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 50bebe16a6..414f4071da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -212,6 +212,7 @@ trigger_build: include: - artifact: generated-config.yml job: check_package + strategy: depend rules: - if: $CI_PIPELINE_SOURCE == "merge_request_event" changes: -- GitLab From 8c7b56d6ac879079842a4d477eff4dc49fd4e0fa Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 6 Sep 2024 09:09:47 +0200 Subject: [PATCH 089/106] fix: ident --- generated-config.tpl | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/generated-config.tpl b/generated-config.tpl index 6ccd39e5a2..fc4cf6bb7d 100644 --- a/generated-config.tpl +++ b/generated-config.tpl @@ -13,7 +13,18 @@ build_package: - WORKDIR="$(pwd)" CCACHE="true" OUTPUTDIR="$(pwd)/output" - mkdir -p ${OUTPUTDIR} - docker build -t "recalbox-${ARCH}" . - - docker run --rm --tmpfs /tmp:exec --security-opt seccomp=unconfined -v "${WORKDIR}:/work" -v "${OUTPUTDIR}:/work/output" -v "/recalbox-builds/dl:/share/dl" -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" -e "ARCH=${ARCH}" -e "RECALBOX_VERSION=${RECALBOX_VERSION}" -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" -e "PACKAGE=${package_name}" "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac + - |- + docker run --rm --tmpfs /tmp:exec \ + --security-opt seccomp=unconfined \ + -v "${WORKDIR}:/work" \ + -v "${OUTPUTDIR}:/work/output" \ + -v "/recalbox-builds/dl:/share/dl" \ + -v "/recalbox-builds/ccaches/ccache-${ARCH}:/share/ccache" \ + -e "ARCH=${ARCH}" \ + -e "RECALBOX_VERSION=${RECALBOX_VERSION}" \ + -e "RECALBOX_CCACHE_ENABLED=${CCACHE}" \ + -e "PACKAGE=${package_name}" \ + "recalbox-${ARCH}" 2>&1 | tee build.log | grep '>>>' || tac build.log | grep '>>>' -m 1 -B 9999 | tac - echo $? tags: - build @@ -21,4 +32,4 @@ build_package: - if: $CI_PIPELINE_SOURCE == "parent_pipeline" parallel: matrix: - - ARCH: + - ARCH: -- GitLab From 7eee6ab48442372a30ec35181b4cda9f14c4f34e Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 17:50:59 +0200 Subject: [PATCH 090/106] feat: auto update changelog --- .gitlab-ci.yml | 9 ++++++++- renovate.json | 8 ++++++++ update_changelog | 6 ++++++ 3 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 update_changelog diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 94430569c9..03c1485aa1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,14 @@ renovate: when: always - when: never variables: - RENOVATE_EXTRA_FLAGS: 'beudbeud/recalbox' + RENOVATE_EXTRA_FLAGS: --allow-post-upgrade-command-templating --allowed-post-upgrade-commands ^update_changelog.* 'beudbeud/recalbox' + before_script: + # install chan to allow changelog updates + - npm install @geut/chan + # make chan available in path + - export PATH="$PATH:$(pwd)/node_modules/.bin" + # make our update_changelog script available in path + - export PATH="$PATH:$(pwd)" .build_template: &build_definition stage: build diff --git a/renovate.json b/renovate.json index 23318553a0..ea2760e66f 100644 --- a/renovate.json +++ b/renovate.json @@ -18,6 +18,14 @@ "prBodyNotes": ["{{#if newDigest}}> 🗒**Changelog**
[Compare revision {{{currentDigest}}} to {{{newDigest}}}]({{{packageName}}}/compare/{{{currentDigest}}}...{{{newDigest}}}){{/if}}"], "prCreation": "approval", "packageRules": [ + { + "$doc": "Update RELEASE-NOTES.md", + "postUpgradeTasks": { + "commands": [ + "update_changelog \"Bump {{{depName}}}\"" + ], + "fileFilters": ["RELEASE-NOTES.md"] + }, { "matchPackagePatterns": ["*"], "enabled": false diff --git a/update_changelog b/update_changelog new file mode 100644 index 0000000000..ef4de0f27b --- /dev/null +++ b/update_changelog @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +# only run if changelog exists and does not already contain this specific version update +if test -f "RELEASE-NOTES.md " && ! grep -q "$@" "RELEASE-NOTES.md "; then + chan added -p RELEASE-NOTES.md -g 'Dependency Updates' "$@" +fi -- GitLab From 7890d5d4d37be79eef47c747f4a7351a5f58553c Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 17:57:33 +0200 Subject: [PATCH 091/106] fix: extra --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 03c1485aa1..fe113ef048 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,7 @@ renovate: when: always - when: never variables: - RENOVATE_EXTRA_FLAGS: --allow-post-upgrade-command-templating --allowed-post-upgrade-commands ^update_changelog.* 'beudbeud/recalbox' + RENOVATE_EXTRA_FLAGS: '--allow-post-upgrade-command-templating --allowed-post-upgrade-commands ^update_changelog.* beudbeud/recalbox' before_script: # install chan to allow changelog updates - npm install @geut/chan -- GitLab From 734fdcf8aa0471f4ddf3e7c2cb0503d341215802 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 18:05:18 +0200 Subject: [PATCH 092/106] fix: extra --- .gitlab-ci.yml | 2 +- config.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe113ef048..ed27ea4504 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,7 @@ renovate: when: always - when: never variables: - RENOVATE_EXTRA_FLAGS: '--allow-post-upgrade-command-templating --allowed-post-upgrade-commands ^update_changelog.* beudbeud/recalbox' + RENOVATE_EXTRA_FLAGS: 'beudbeud/recalbox' before_script: # install chan to allow changelog updates - npm install @geut/chan diff --git a/config.js b/config.js index 8a5cd1890c..4dcbdf8183 100644 --- a/config.js +++ b/config.js @@ -5,4 +5,6 @@ module.exports = { username: 'renovate-bot', gitAuthor: 'Renovate Bot ', autodiscover: false, + allowPostUpgradeCommandTemplating: true + allowedPostUpgradeCommands: ['^update_changelog.*'] }; -- GitLab From 691ce33f8d987650d0095e6b4e15def1dfc3a452 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 18:06:43 +0200 Subject: [PATCH 093/106] fix: extra --- config.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.js b/config.js index 4dcbdf8183..18f1e6875d 100644 --- a/config.js +++ b/config.js @@ -5,6 +5,6 @@ module.exports = { username: 'renovate-bot', gitAuthor: 'Renovate Bot ', autodiscover: false, - allowPostUpgradeCommandTemplating: true - allowedPostUpgradeCommands: ['^update_changelog.*'] + allowPostUpgradeCommandTemplating: true, + allowedPostUpgradeCommands: ['^update_changelog.*'], }; -- GitLab From 4f1247a919c9bad0853e03b0868a6a30d1d5ce36 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 18:18:22 +0200 Subject: [PATCH 094/106] fix: extra --- renovate.json | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/renovate.json b/renovate.json index ea2760e66f..0625467236 100644 --- a/renovate.json +++ b/renovate.json @@ -19,16 +19,18 @@ "prCreation": "approval", "packageRules": [ { - "$doc": "Update RELEASE-NOTES.md", - "postUpgradeTasks": { + "matchPackagePatterns": ["*"], + "enabled": false + }, + { + "postUpgradeTasks": { "commands": [ "update_changelog \"Bump {{{depName}}}\"" ], - "fileFilters": ["RELEASE-NOTES.md"] - }, - { - "matchPackagePatterns": ["*"], - "enabled": false + "fileFilters": ["RELEASE-NOTES.md"], + "executionMode": "update" + }, + "packagePatterns": [".*"] }, { "matchPackagePatterns": ["/libretro/"], -- GitLab From 4f8d4a71399ae1f82a4f63ea0c8c0d4416ae6cb9 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 18:22:36 +0200 Subject: [PATCH 095/106] fix: extra --- renovate.json | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/renovate.json b/renovate.json index 0625467236..b462d1fa7e 100644 --- a/renovate.json +++ b/renovate.json @@ -23,22 +23,19 @@ "enabled": false }, { + "matchPackagePatterns": ["/libretro/"], + "enabled": true, + "labels": ["renovate", "Components::Emulators"], + "commitMessagePrefix": "chore:", + "commitMessageAction": "bump", + "commitMessageLowerCase": "auto", "postUpgradeTasks": { "commands": [ "update_changelog \"Bump {{{depName}}}\"" ], "fileFilters": ["RELEASE-NOTES.md"], "executionMode": "update" - }, - "packagePatterns": [".*"] - }, - { - "matchPackagePatterns": ["/libretro/"], - "enabled": true, - "labels": ["renovate", "Components::Emulators"], - "commitMessagePrefix": "chore:", - "commitMessageAction": "bump", - "commitMessageLowerCase": "auto" + } }, { "matchPackagePatterns": ["/recalbox/"], @@ -46,7 +43,14 @@ "labels": ["renovate", "Components::System"], "commitMessagePrefix": "chore:", "commitMessageAction": "bump", - "commitMessageLowerCase": "auto" + "commitMessageLowerCase": "auto", + "postUpgradeTasks": { + "commands": [ + "update_changelog \"Bump {{{depName}}}\"" + ], + "fileFilters": ["RELEASE-NOTES.md"], + "executionMode": "update" + } } ], "customManagers": [ -- GitLab From bbc5f2d28655b300e573b89050c2a9eef7398091 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 18:27:18 +0200 Subject: [PATCH 096/106] fix: extra --- update_changelog | 3 +++ 1 file changed, 3 insertions(+) mode change 100644 => 100755 update_changelog diff --git a/update_changelog b/update_changelog old mode 100644 new mode 100755 index ef4de0f27b..7e551919de --- a/update_changelog +++ b/update_changelog @@ -1,5 +1,8 @@ #!/usr/bin/env bash +commitdate=date=$(git show -s --date=format:'%Y/%m/%d' --format=%cd) +sed + # only run if changelog exists and does not already contain this specific version update if test -f "RELEASE-NOTES.md " && ! grep -q "$@" "RELEASE-NOTES.md "; then chan added -p RELEASE-NOTES.md -g 'Dependency Updates' "$@" -- GitLab From 002c4cb014d419f91f78ca1b784a4c41905d7679 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Fri, 18 Oct 2024 18:45:44 +0200 Subject: [PATCH 097/106] fix: extra --- renovate.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/renovate.json b/renovate.json index b462d1fa7e..cb441842f3 100644 --- a/renovate.json +++ b/renovate.json @@ -49,7 +49,7 @@ "update_changelog \"Bump {{{depName}}}\"" ], "fileFilters": ["RELEASE-NOTES.md"], - "executionMode": "update" + "executionMode": "branch" } } ], -- GitLab From 517a57c2098037ec0b664d123c527c3dc39ec04b Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 19:39:55 +0000 Subject: [PATCH 098/106] fix: update_changelog --- update_changelog | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/update_changelog b/update_changelog index 7e551919de..4cbef936ab 100755 --- a/update_changelog +++ b/update_changelog @@ -1,9 +1,6 @@ #!/usr/bin/env bash -commitdate=date=$(git show -s --date=format:'%Y/%m/%d' --format=%cd) -sed - # only run if changelog exists and does not already contain this specific version update -if test -f "RELEASE-NOTES.md " && ! grep -q "$@" "RELEASE-NOTES.md "; then - chan added -p RELEASE-NOTES.md -g 'Dependency Updates' "$@" +if test -f "RELEASE-NOTES.md" && ! grep -q "$@" "RELEASE-NOTES.md"; then + chan changed -g 'Dependency Updates' "$@" fi -- GitLab From b6bfd4d6b03539f2533104ad039dfe70ba98b4c8 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 20:49:33 +0100 Subject: [PATCH 099/106] fix: update changelog --- renovate.json | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/renovate.json b/renovate.json index cb441842f3..c9f95cceab 100644 --- a/renovate.json +++ b/renovate.json @@ -33,8 +33,7 @@ "commands": [ "update_changelog \"Bump {{{depName}}}\"" ], - "fileFilters": ["RELEASE-NOTES.md"], - "executionMode": "update" + "fileFilters": ["RELEASE-NOTES.md"] } }, { @@ -48,8 +47,7 @@ "commands": [ "update_changelog \"Bump {{{depName}}}\"" ], - "fileFilters": ["RELEASE-NOTES.md"], - "executionMode": "branch" + "fileFilters": ["RELEASE-NOTES.md"] } } ], -- GitLab From 612bf98c1196e59c994d2eb5f2512cb9c061cee4 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 20:51:29 +0100 Subject: [PATCH 100/106] fix: allow template --- config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.js b/config.js index 18f1e6875d..c0f0bc5b17 100644 --- a/config.js +++ b/config.js @@ -6,5 +6,5 @@ module.exports = { gitAuthor: 'Renovate Bot ', autodiscover: false, allowPostUpgradeCommandTemplating: true, - allowedPostUpgradeCommands: ['^update_changelog.*'], + allowedPostUpgradeCommands: ['^update_changelog'], }; -- GitLab From ac6eb73c946797393ca02e5f75a6292a94ae40d0 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 21:02:17 +0100 Subject: [PATCH 101/106] fix: force root for renovate --- .gitlab-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ed27ea4504..5612448972 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,6 +223,8 @@ include: file: '/templates/renovate.gitlab-ci.yml' renovate: + docker: + user: root rules: - if: $CI_PIPELINE_SOURCE =~ "/^(schedule)$/" && $WHICH_SCHEDULE == "renovate" when: always -- GitLab From b3a4a21f84daaf149e8b44db72f8e6ab54d18939 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 21:03:04 +0100 Subject: [PATCH 102/106] fix: install npm --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5612448972..4695f71062 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -232,6 +232,7 @@ renovate: variables: RENOVATE_EXTRA_FLAGS: 'beudbeud/recalbox' before_script: + - apt update && apt install npm -y # install chan to allow changelog updates - npm install @geut/chan # make chan available in path -- GitLab From 4e898ff6ed6df8f4cc9808a0ad8943547272e2dc Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 21:07:22 +0100 Subject: [PATCH 103/106] fix: install npm --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4695f71062..85ab729b40 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,8 @@ include: file: '/templates/renovate.gitlab-ci.yml' renovate: - docker: + image: ghcr.io/renovatebot/renovate:39.75.0@sha256:34dcdc05e3505e16c9008708dc24d5da30ee130cc6fe30577a37c7cb4316c7fa + docker: user: root rules: - if: $CI_PIPELINE_SOURCE =~ "/^(schedule)$/" && $WHICH_SCHEDULE == "renovate" -- GitLab From f8e24ed4fd19045b0116c6f81150710dbcf758e5 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 21:08:18 +0100 Subject: [PATCH 104/106] fix: install npm --- .gitlab-ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 85ab729b40..1617774d94 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -223,7 +223,8 @@ include: file: '/templates/renovate.gitlab-ci.yml' renovate: - image: ghcr.io/renovatebot/renovate:39.75.0@sha256:34dcdc05e3505e16c9008708dc24d5da30ee130cc6fe30577a37c7cb4316c7fa + image: + name: ghcr.io/renovatebot/renovate:39.75.0@sha256:34dcdc05e3505e16c9008708dc24d5da30ee130cc6fe30577a37c7cb4316c7fa docker: user: root rules: -- GitLab From 9adf073ead00be39d0ef0580aa414bbbae736275 Mon Sep 17 00:00:00 2001 From: Adrien Beudin Date: Thu, 19 Dec 2024 21:11:03 +0100 Subject: [PATCH 105/106] fix: install npm --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1617774d94..080f9a163d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -222,11 +222,15 @@ include: - project: 'renovate-bot/renovate-runner' file: '/templates/renovate.gitlab-ci.yml' -renovate: +.renovate-config: + extends: .renovate image: name: ghcr.io/renovatebot/renovate:39.75.0@sha256:34dcdc05e3505e16c9008708dc24d5da30ee130cc6fe30577a37c7cb4316c7fa docker: user: root + +renovate-runner: + extends: .renovate-config rules: - if: $CI_PIPELINE_SOURCE =~ "/^(schedule)$/" && $WHICH_SCHEDULE == "renovate" when: always -- GitLab From a7b559aabe850a9c658a76b9d5b357cedba81799 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Thu, 19 Dec 2024 20:23:53 +0000 Subject: [PATCH 106/106] chore: bump dolphin digest to 89a4df7 --- package/libretro-dolphin/libretro-dolphin.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/libretro-dolphin/libretro-dolphin.mk b/package/libretro-dolphin/libretro-dolphin.mk index 9f0150350e..230faa5bb8 100644 --- a/package/libretro-dolphin/libretro-dolphin.mk +++ b/package/libretro-dolphin/libretro-dolphin.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBRETRO_DOLPHIN_VERSION = 2f4b0f7902257d40a054f60b2c670d6e314f2a04 +LIBRETRO_DOLPHIN_VERSION = 89a4df725d4eb24537728f7d655cddb1add25c18 LIBRETRO_DOLPHIN_SITE = https://github.com/libretro/dolphin LIBRETRO_DOLPHIN_SITE_METHOD=git LIBRETRO_DOLPHIN_GIT_SUBMODULES=YES -- GitLab