From e63ea79e97cbd5ad24cfe205cf539794f3c00687 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Oct 2024 01:16:24 +0000 Subject: [PATCH] =?UTF-8?q?hato-bot=E3=81=AECI=E3=82=92=E5=8F=8D=E6=98=A0?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=88=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- renovate.json | 1 + scripts/pr_format/pr_format/format.sh | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/renovate.json b/renovate.json index e0d936acc..b368c2029 100644 --- a/renovate.json +++ b/renovate.json @@ -1,5 +1,6 @@ { "extends": ["github>dev-hato/renovate-config"], + "ignoreDeps": ["pyink"], "packageRules": [ { "matchPackageNames": ["postgres"], diff --git a/scripts/pr_format/pr_format/format.sh b/scripts/pr_format/pr_format/format.sh index afdd13d15..20245491d 100755 --- a/scripts/pr_format/pr_format/format.sh +++ b/scripts/pr_format/pr_format/format.sh @@ -1,6 +1,10 @@ #!/usr/bin/env bash pipenv run python "${GITHUB_WORKSPACE}/scripts/pr_format/pr_format/fix_pipfile.py" +tag_name="$(yq '.jobs.pr-super-lint.steps[-1].uses' .github/workflows/pr-test.yml | sed -e 's;/slim@.*;:slim;g')" +tag_version="$(yq '.jobs.pr-super-lint.steps[-1].uses | line_comment' .github/workflows/pr-test.yml)" +pyink_version="$(docker run --rm --entrypoint '' "ghcr.io/${tag_name}-${tag_version}" /bin/sh -c 'pyink --version' | grep pyink | awk '{ print $2 }')" +sed -i -e "s/pyink = .*/pyink = \"==${pyink_version}\"/g" Pipfile pipenv install --dev pipenv run autopep8 --exit-code --in-place --recursive . pipenv run pyink --config .python-black .