From 915341b9cda2bc6140c18130e3cfd0c5e7bad954 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Fri, 15 Mar 2024 14:09:38 +0800 Subject: [PATCH 1/2] chore: unify quotation marks in GitHub Action Workflows --- .github/workflows/ci.yml | 10 +++++----- .github/workflows/devcontainer.yml | 10 +++++----- .github/workflows/release.yml | 14 +++++++------- .github/workflows/renovate.yml | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 2ea2b2b3..87053eaf 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -26,11 +26,11 @@ jobs: strategy: matrix: python-version: - - '3.8' - - '3.9' - - '3.10' - - '3.11' - - '3.12' + - "3.8" + - "3.9" + - "3.10" + - "3.11" + - "3.12" consistency: if: ${{ !cancelled() && ! failure() }} runs-on: ubuntu-22.04 diff --git a/.github/workflows/devcontainer.yml b/.github/workflows/devcontainer.yml index a51d3821..77f73528 100644 --- a/.github/workflows/devcontainer.yml +++ b/.github/workflows/devcontainer.yml @@ -32,11 +32,11 @@ jobs: strategy: matrix: python-version: - - '3.8' - - '3.9' - - '3.10' - - '3.11' - - '3.12' + - "3.8" + - "3.9" + - "3.10" + - "3.11" + - "3.12" on: push: branches: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9478cc48..94d8fbeb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ jobs: - uses: pdm-project/setup-pdm@c050bdcb2405837648035b6678c75609d53a749f # v4 with: cache: true - python-version: '3.12' + python-version: "3.12" - id: pages name: Setup pages uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0 @@ -97,11 +97,11 @@ jobs: strategy: matrix: python-version: - - '3.8' - - '3.9' - - '3.10' - - '3.11' - - '3.12' + - "3.8" + - "3.9" + - "3.10" + - "3.11" + - "3.12" package-publish: needs: release-publish runs-on: ubuntu-22.04 @@ -110,7 +110,7 @@ jobs: - uses: pdm-project/setup-pdm@c050bdcb2405837648035b6678c75609d53a749f # v4 with: cache: true - python-version: '3.12' + python-version: "3.12" - run: env | sort - env: PDM_PUBLISH_PASSWORD: ${{ secrets.PDM_PUBLISH_PASSWORD }} diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml index f154ce95..687643c8 100644 --- a/.github/workflows/renovate.yml +++ b/.github/workflows/renovate.yml @@ -9,13 +9,13 @@ jobs: RENOVATE_ENABLED: ${{ vars.RENOVATE_ENABLED || true }} RENOVATE_ENABLED_MANAGERS: '["pep621", "github-actions", "gitlabci", "regex"]' RENOVATE_GIT_AUTHOR: Renovate GitHub Bot - RENOVATE_OPTIMIZE_FOR_DISABLED: 'true' + RENOVATE_OPTIMIZE_FOR_DISABLED: "true" RENOVATE_PLATFORM: github RENOVATE_REPOSITORIES: '["${{ github.repository }}"]' RENOVATE_REPOSITORY_CACHE: enabled RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }} image: ghcr.io/renovatebot/renovate:37.246.0-full@sha256:2bbd0a3d5d92be7c56168b369dc4119840a9e341c3c09fdef9d1ac6735042c80 - options: '--user root' + options: "--user root" runs-on: ubuntu-22.04 steps: - run: env | sort @@ -37,5 +37,5 @@ jobs: on: schedule: # * is a special character in YAML so you have to quote this string - - cron: '*/15 0-3 * * 1' + - cron: "*/15 0-3 * * 1" workflow_dispatch: null From 16793febe0d8defefcbbb319d97ce63edec1f867 Mon Sep 17 00:00:00 2001 From: Xuan Hu Date: Fri, 15 Mar 2024 14:11:33 +0800 Subject: [PATCH 2/2] update template --- .../workflows/ci.yml.jinja | 10 +++++----- .../workflows/devcontainer.yml.jinja | 10 +++++----- .../workflows/release.yml.jinja | 14 +++++++------- .../workflows/renovate.yml.jinja | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja index 1324069d..9ac703dc 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/ci.yml.jinja @@ -28,19 +28,19 @@ jobs: matrix: python-version: [%- if version_between("3.8", min_py, max_py) %] - - '3.8' + - "3.8" [%- endif %] [%- if version_between("3.9", min_py, max_py) %] - - '3.9' + - "3.9" [%- endif %] [%- if version_between("3.10", min_py, max_py) %] - - '3.10' + - "3.10" [%- endif %] [%- if version_between("3.11", min_py, max_py) %] - - '3.11' + - "3.11" [%- endif %] [%- if version_between("3.12", min_py, max_py) %] - - '3.12' + - "3.12" [%- endif %] [%- if project_name == "Serious Scaffold Python" %] consistency: diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja index 8ea52d98..acbd3f7a 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/devcontainer.yml.jinja @@ -34,19 +34,19 @@ jobs: matrix: python-version: [%- if version_between("3.8", min_py, max_py) %] - - '3.8' + - "3.8" [%- endif %] [%- if version_between("3.9", min_py, max_py) %] - - '3.9' + - "3.9" [%- endif %] [%- if version_between("3.10", min_py, max_py) %] - - '3.10' + - "3.10" [%- endif %] [%- if version_between("3.11", min_py, max_py) %] - - '3.11' + - "3.11" [%- endif %] [%- if version_between("3.12", min_py, max_py) %] - - '3.12' + - "3.12" [%- endif %] on: push: diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja index b7f46c57..72035680 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/release.yml.jinja @@ -10,7 +10,7 @@ jobs: - uses: pdm-project/setup-pdm@c050bdcb2405837648035b6678c75609d53a749f # v4 with: cache: true - python-version: '{{ default_py }}' + python-version: "{{ default_py }}" - id: pages name: Setup pages uses: actions/configure-pages@1f0c5cde4bc74cd7e1254d0cb4de8d49e9068c7d # v4.0.0 @@ -99,19 +99,19 @@ jobs: matrix: python-version: [%- if version_between("3.8", min_py, max_py) %] - - '3.8' + - "3.8" [%- endif %] [%- if version_between("3.9", min_py, max_py) %] - - '3.9' + - "3.9" [%- endif %] [%- if version_between("3.10", min_py, max_py) %] - - '3.10' + - "3.10" [%- endif %] [%- if version_between("3.11", min_py, max_py) %] - - '3.11' + - "3.11" [%- endif %] [%- if version_between("3.12", min_py, max_py) %] - - '3.12' + - "3.12" [%- endif %] package-publish: needs: release-publish @@ -121,7 +121,7 @@ jobs: - uses: pdm-project/setup-pdm@c050bdcb2405837648035b6678c75609d53a749f # v4 with: cache: true - python-version: '{{ default_py }}' + python-version: "{{ default_py }}" - run: env | sort - env: PDM_PUBLISH_PASSWORD: {{ '${{ secrets.PDM_PUBLISH_PASSWORD }}' }} diff --git a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/renovate.yml.jinja b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/renovate.yml.jinja index b86d31a0..578c8445 100644 --- a/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/renovate.yml.jinja +++ b/template/[% if repo_host_type == 'github.com' %].github[% endif %]/workflows/renovate.yml.jinja @@ -13,13 +13,13 @@ jobs: RENOVATE_ENABLED_MANAGERS: '["pep621", "github-actions", "regex"]' [%- endif %] RENOVATE_GIT_AUTHOR: Renovate GitHub Bot - RENOVATE_OPTIMIZE_FOR_DISABLED: 'true' + RENOVATE_OPTIMIZE_FOR_DISABLED: "true" RENOVATE_PLATFORM: github RENOVATE_REPOSITORIES: '["{{ '${{ github.repository }}' }}"]' RENOVATE_REPOSITORY_CACHE: enabled RENOVATE_TOKEN: {{ '${{ secrets.RENOVATE_TOKEN }}' }} image: ghcr.io/renovatebot/renovate:37.246.0-full@sha256:2bbd0a3d5d92be7c56168b369dc4119840a9e341c3c09fdef9d1ac6735042c80 - options: '--user root' + options: "--user root" runs-on: ubuntu-22.04 steps: - run: env | sort @@ -41,5 +41,5 @@ jobs: on: schedule: # * is a special character in YAML so you have to quote this string - - cron: '*/15 0-3 * * 1' + - cron: "*/15 0-3 * * 1" workflow_dispatch: null