Skip to content

Commit 0737923

Browse files
committed
chore: update CI workflow to fetch and merge the current branch before committing coverage.svg, and change force_with_lease to force
1 parent 7fedf7e commit 0737923

File tree

1 file changed

+11
-8
lines changed

1 file changed

+11
-8
lines changed

.github/workflows/ci.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
name: CI
22

33
on:
4-
# TODO: Make separate CI for direct push to master and PRs
5-
# push:
6-
# branches:
7-
# - master
8-
# paths-ignore:
9-
# - "**/coverage.svg"
4+
# TODO: Make separate CI for direct push to master and PRs
5+
# push:
6+
# branches:
7+
# - master
8+
# paths-ignore:
9+
# - "**/coverage.svg"
1010

1111
pull_request_target:
1212
branches:
@@ -31,10 +31,10 @@ jobs:
3131
- name: Checkout 🛎️
3232
uses: actions/checkout@v4
3333

34-
- name: Setup Python 3.11 🐍
34+
- name: Setup Python 3.13 🐍
3535
uses: actions/setup-python@v5
3636
with:
37-
python-version: 3.11
37+
python-version: 3.13
3838
cache: "pipenv"
3939

4040
- name: Install pipenv
@@ -65,6 +65,8 @@ jobs:
6565
run: |
6666
git config --local user.email "github-actions[bot]@users.noreply.github.com"
6767
git config --local user.name "github-actions[bot]"
68+
git fetch origin ${{ github.head_ref }}
69+
git merge origin/${{ github.head_ref }}
6870
git add coverage.svg
6971
git commit -m "Updated coverage.svg"
7072
@@ -74,6 +76,7 @@ jobs:
7476
with:
7577
github_token: ${{ secrets.github_token }}
7678
branch: ${{ github.head_ref }}
79+
force: true
7780

7881
- name: Create Assets Folder 📥
7982
run: mkdir assets

0 commit comments

Comments
 (0)