From 13fb9e5b7e329ec55b5ef32c34169adb2791b890 Mon Sep 17 00:00:00 2001 From: clux Date: Sat, 12 Oct 2024 21:46:21 +0100 Subject: [PATCH 1/4] Try github invoked renovate so that we can run rustfmt after Signed-off-by: clux --- .github/renovate-entrypoint.sh | 24 ++++++++++++++++++++++++ .github/workflows/renovate.yml | 27 +++++++++++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 .github/renovate-entrypoint.sh create mode 100644 .github/workflows/renovate.yml diff --git a/.github/renovate-entrypoint.sh b/.github/renovate-entrypoint.sh new file mode 100644 index 0000000..4be2bbd --- /dev/null +++ b/.github/renovate-entrypoint.sh @@ -0,0 +1,24 @@ +#!/bin/bash +set -exuo pipefail + +# renovate: datasource=github-releases depName=clux/whyq +export YQ_VER=0.10.2 +# renovate: datasource=github-releases depName=casey/just +export JUST_VER=1.28.0 +# renovate: datasource=github-releases depName=BurntSushi/ripgrep +export RG_VER=14.1.0 +# renovate: datasource=github-releases depName=sharkdp/fd +export FD_VER=10.2.0 +# renovate: datasource=github-releases depName=chmln/sd +export SD_VER=1.0.0 + +apt update +apt install -y curl git protobuf-compiler + +curl -sSL https://github.com/clux/whyq/releases/download/${YQ_VER}/yq-x86_64-unknown-linux-musl.tar.xz | tar xJ --strip-components=1 -C /usr/local/bin +curl -sSL https://github.com/casey/just/releases/download/${JUST_VER}/just-${JUST_VER}-x86_64-unknown-linux-musl.tar.gz | tar xz -C /usr/local/bin +curl -sSL https://github.com/BurntSushi/ripgrep/releases/download/${RG_VER}/ripgrep-${RG_VER}-x86_64-unknown-linux-musl.tar.gz | tar xz --strip-components=1 -C /usr/local/bin +curl -sSL https://github.com/sharkdp/fd/releases/download/v${FD_VER}/fd-v${FD_VER}-x86_64-unknown-linux-musl.tar.gz | tar xz --strip-components=1 -C /usr/local/bin/ --wildcards '*fd' +curl -sSL https://github.com/chmln/sd/releases/download/v${SD_VER}/sd-v${SD_VER}-x86_64-unknown-linux-musl.tar.gz | tar xz --strip-components=1 -C /usr/local/bin/ --wildcards '*sd' + +runuser -u ubuntu renovate diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml new file mode 100644 index 0000000..cfd9b2b --- /dev/null +++ b/.github/workflows/renovate.yml @@ -0,0 +1,27 @@ +name: Renovate +on: + push: # while testing + #schedule: + # - cron: "0/15 * * * *" + workflow_dispatch: + +permissions: + contents: write + pull-requests: write + +jobs: + renovate: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Self-hosted Renovate + uses: renovatebot/github-action@v40.3.1 + with: + token: ${{ secrets.RENOVATE_TOKEN }} + docker-cmd-file: .github/renovate-entrypoint.sh + docker-user: root + configurationFile: .renovate.json5 + env: + LOG_LEVEL: 'debug' From 98ecec065b402eb31b82008328bda6a8a3034238 Mon Sep 17 00:00:00 2001 From: clux Date: Sat, 12 Oct 2024 21:54:03 +0100 Subject: [PATCH 2/4] Try out github renovate Signed-off-by: clux --- .github/workflows/renovate.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index cfd9b2b..1167436 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -15,6 +15,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@stable - name: Self-hosted Renovate uses: renovatebot/github-action@v40.3.1 @@ -25,3 +26,5 @@ jobs: configurationFile: .renovate.json5 env: LOG_LEVEL: 'debug' + # hopefully not too late... + - run: cargo fmt From 0e372ae68efa74317c3930e69c60e8fc44a4ab11 Mon Sep 17 00:00:00 2001 From: clux Date: Sat, 12 Oct 2024 21:54:52 +0100 Subject: [PATCH 3/4] file path Signed-off-by: clux --- .github/workflows/renovate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index 1167436..9a8b237 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -23,7 +23,7 @@ jobs: token: ${{ secrets.RENOVATE_TOKEN }} docker-cmd-file: .github/renovate-entrypoint.sh docker-user: root - configurationFile: .renovate.json5 + configurationFile: renovate.json5 env: LOG_LEVEL: 'debug' # hopefully not too late... From b2a5631f5be3fe409f22408625524d7adf38da69 Mon Sep 17 00:00:00 2001 From: clux Date: Sat, 12 Oct 2024 22:12:31 +0100 Subject: [PATCH 4/4] more attempts Signed-off-by: clux --- .github/renovate-entrypoint.sh | 1 - renovate.json5 | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/renovate-entrypoint.sh b/.github/renovate-entrypoint.sh index 4be2bbd..947a8a7 100644 --- a/.github/renovate-entrypoint.sh +++ b/.github/renovate-entrypoint.sh @@ -1,5 +1,4 @@ #!/bin/bash -set -exuo pipefail # renovate: datasource=github-releases depName=clux/whyq export YQ_VER=0.10.2 diff --git a/renovate.json5 b/renovate.json5 index 9b12dac..716861e 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -1,7 +1,6 @@ { $schema: "https://docs.renovatebot.com/renovate-schema.json", extends: [ - "config:base", ":gitSignOff", ":disableDependencyDashboard" ], @@ -14,6 +13,7 @@ "This PR bumps the Kubernetes version in the justfile and runs just renovate.", "{{#if isMinor}}Please check for inconsistencies in the new version{{/if}}", ], + branchPrefix: "ghreno", customManagers: [ { customType: "regex",