Skip to content

Commit df5bd28

Browse files
authored
Merge branch 'main' into feat/py313
2 parents d1a8599 + f0c0f85 commit df5bd28

31 files changed

+128
-60
lines changed

.github/workflows/dependabot_automerge.yml renamed to .github/workflows/automerge_prs.yml

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Dependabot auto-merge
1+
name: Automerge PRs (dependabot and pre-commit)
22
on: pull_request
33

44
permissions:
@@ -8,7 +8,6 @@ permissions:
88
jobs:
99
dependabot:
1010
runs-on: ubuntu-latest
11-
# Only run this workflow for branches starting with "dependabot/"
1211
if: startsWith(github.head_ref, 'dependabot/')
1312
steps:
1413
- name: Dependabot metadata
@@ -29,3 +28,25 @@ jobs:
2928
env:
3029
PR_URL: ${{github.event.pull_request.html_url}}
3130
GH_TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
31+
32+
pre-commit:
33+
runs-on: ubuntu-latest
34+
if: startsWith(github.head_ref, 'pre-commit-ci-update-config')
35+
steps:
36+
- name: Assign PR to pyansys-ci-bot
37+
run: gh pr edit --assignee pyansys-ci-bot "$PR_URL"
38+
env:
39+
PR_URL: ${{github.event.pull_request.html_url}}
40+
GH_TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
41+
42+
- name: Approve a PR
43+
run: gh pr review --approve "$PR_URL"
44+
env:
45+
PR_URL: ${{github.event.pull_request.html_url}}
46+
GH_TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}
47+
48+
- name: Enable auto-merge
49+
run: gh pr merge --auto --squash "$PR_URL"
50+
env:
51+
PR_URL: ${{github.event.pull_request.html_url}}
52+
GH_TOKEN: ${{ secrets.PYANSYS_CI_BOT_TOKEN }}

.github/workflows/ci_cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ jobs:
217217
retention-days: 7
218218

219219
- name: Upload coverage to Codecov
220-
uses: codecov/codecov-action@v4
220+
uses: codecov/codecov-action@v5
221221
if: matrix.docker-image == 'windows-latest'
222222
env:
223223
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
@@ -451,7 +451,7 @@ jobs:
451451
if: github.event_name == 'push' && contains(github.ref, 'refs/tags')
452452
runs-on:
453453
group: ansys-network
454-
labels: [self-hosted, Windows, signtool]
454+
labels: [self-hosted, Windows, pygeometry]
455455
env:
456456
REUSE_LAST_ARTIFACTS: ${{ vars.REUSE_LAST_ARTIFACTS == 1 }}
457457

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ exclude: "tests/integration/files"
77
repos:
88

99
- repo: https://github.com/astral-sh/ruff-pre-commit
10-
rev: v0.7.3
10+
rev: v0.8.0
1111
hooks:
1212
- id: ruff
1313
- id: ruff-format

doc/changelog.d/1519.maintenance.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/1520.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/1521.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/1522.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/1524.documentation.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/1525.dependencies.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

doc/changelog.d/1527.documentation.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)