From 34db809077b47d684500d0b861cfcf5001fab803 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 16 Aug 2026 11:10:09 +0000 Subject: [PATCH 1/2] Bump actions/checkout from 4 to 7 Bumps [actions/checkout](https://github.com/actions/checkout) from 4 to 7. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v4...v7) --- updated-dependencies: - dependency-name: actions/checkout dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 5 +++++ .github/workflows/desktop.yml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5433c18..a4e75a5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,8 +12,13 @@ jobs: test: runs-on: ubuntu-latest steps: +<<<<<<< HEAD - uses: actions/checkout@v4 - uses: actions/setup-python@v7 +======= + - uses: actions/checkout@v7 + - uses: actions/setup-python@v5 +>>>>>>> defef12 (Bump actions/checkout from 4 to 7) with: python-version: "3.12" - uses: actions/setup-node@v4 diff --git a/.github/workflows/desktop.yml b/.github/workflows/desktop.yml index cfbaf32..58907bf 100644 --- a/.github/workflows/desktop.yml +++ b/.github/workflows/desktop.yml @@ -33,7 +33,7 @@ jobs: env: CSC_IDENTITY_AUTO_DISCOVERY: "false" steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v7 - uses: actions/setup-python@v7 with: From e8e87eda19fa640b263ef599f31eebef6368ffbc Mon Sep 17 00:00:00 2001 From: Cursor Agent Date: Sun, 16 Aug 2026 11:17:12 +0000 Subject: [PATCH 2/2] Keep setup-python v7 when bumping checkout to v7 Co-authored-by: zord.lack.net --- .github/workflows/ci.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a4e75a5..64c310c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,13 +12,8 @@ jobs: test: runs-on: ubuntu-latest steps: -<<<<<<< HEAD - - uses: actions/checkout@v4 - - uses: actions/setup-python@v7 -======= - uses: actions/checkout@v7 - - uses: actions/setup-python@v5 ->>>>>>> defef12 (Bump actions/checkout from 4 to 7) + - uses: actions/setup-python@v7 with: python-version: "3.12" - uses: actions/setup-node@v4