From eccdd57deb31ae541cc587f6db052d1c972f7f3e Mon Sep 17 00:00:00 2001
From: "msclock-bot[bot]" <163820484+msclock-bot[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2024 06:13:22 +0000
Subject: [PATCH 1/2] chore(deps): update dependency
 https://github.com/serious-scaffold/ss-pybind11 to v0.8.13

---
 .copier-answers.yml            | 2 +-
 .github/workflows/cd.yml       | 4 ++++
 .github/workflows/renovate.yml | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.copier-answers.yml b/.copier-answers.yml
index e2e7560..7034a02 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,4 +1,4 @@
-_commit: v0.8.12
+_commit: v0.8.13
 _src_path: https://github.com/serious-scaffold/ss-pybind11
 author_email: msclock@126.com
 author_name: l.feng
diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 07f4da3..46a51d9 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -36,6 +36,7 @@ jobs:
 
     strategy:
       matrix:
+<<<<<<< before updating
         arch: [aarch64, ppc64le, s390x, armv7l, x86_64, i686]
         build: [manylinux, musllinux]
         os: [ubuntu-24.04] # renovate: github-runner
@@ -56,6 +57,9 @@ jobs:
           - os: macos-latest
             arch: arm64
             build: macos
+=======
+        os: [ubuntu-24.04, windows-2022, macos-14] # renovate: github-runner
+>>>>>>> after updating
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
diff --git a/.github/workflows/renovate.yml b/.github/workflows/renovate.yml
index fc89c74..3765d49 100644
--- a/.github/workflows/renovate.yml
+++ b/.github/workflows/renovate.yml
@@ -3,7 +3,7 @@ name: Renovate
 on:
   schedule:
     # Match renovate schedule:earlyMondays and schedule:automergeMonthly
-    - cron: '* 0-3 * * *'
+    - cron: '*/15 0-3 * * *'
   workflow_dispatch:
 
 jobs:

From 5c1375408594b9c6c5535ab19ad9550a12bf1414 Mon Sep 17 00:00:00 2001
From: "l.feng" <43399351+msclock@users.noreply.github.com>
Date: Thu, 5 Dec 2024 12:54:50 +0800
Subject: [PATCH 2/2] Resolve conflicts

Signed-off-by: l.feng <43399351+msclock@users.noreply.github.com>
---
 .github/workflows/cd.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
index 46a51d9..07f4da3 100644
--- a/.github/workflows/cd.yml
+++ b/.github/workflows/cd.yml
@@ -36,7 +36,6 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< before updating
         arch: [aarch64, ppc64le, s390x, armv7l, x86_64, i686]
         build: [manylinux, musllinux]
         os: [ubuntu-24.04] # renovate: github-runner
@@ -57,9 +56,6 @@ jobs:
           - os: macos-latest
             arch: arm64
             build: macos
-=======
-        os: [ubuntu-24.04, windows-2022, macos-14] # renovate: github-runner
->>>>>>> after updating
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4