Skip to content

Commit 2b9e0f6

Browse files
committed
Apply minor fixes before v3.35.0
1 parent e13677d commit 2b9e0f6

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
lines changed

.circleci/config.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -318,12 +318,14 @@ workflows:
318318
- python 3_11 git 2_38_1
319319
- python 3_12 git 2_46_1
320320
- python 3_13 git 2_47_0
321-
- macos tests
321+
# MacOS and esp. Windows tests take a relatively long time on critical path,
322+
# and fail very rarely in isolation (i.e. in cases when tests on Linux don't fail).
323+
- macos tests:
324+
<<: *only_special_branches
322325
- windows tests:
323-
# Windows tests take a relatively long time on critical path,
324-
# and fail very rarely when other tests don't fail
325326
<<: *only_special_branches
326327
- coverage upload:
328+
# Note that the jobs that were skipped due to the `filter` are apparently not treated as required.
327329
requires:
328330
*test_jobs
329331
- dry run releases:
@@ -341,11 +343,11 @@ workflows:
341343
<<: *only_master
342344
requires:
343345
- dry run releases
344-
# Let's perform a GitHub release even if some of the preceding release steps failed,
346+
# Let's create a GitHub release even if some of the other release steps failed,
345347
# to keep GitHub release history consistent
346348
- create github release:
347349
<<: *only_master
348350
requires:
349351
- dry run releases
350352

351-
# Note: there are also releases happening outside of our CI, see PACKAGES.md
353+
# Note: most releases happen outside of our CI, see PACKAGES.md

RELEASE_NOTES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## New in git-machete 3.35.0
44

5-
- added: `git machete traverse --sync-github-prs`/`--sync-gitlab-mrs` suggests creating PRs/MRs for untracked branches (suggested by @bradneuman and @tir38)
5+
- added: `git machete traverse --sync-github-prs`/`--sync-gitlab-mrs` suggests creating PRs/MRs for branches without one (suggested by @bradneuman and @tir38)
66

77
## New in git-machete 3.34.1
88

tox.ini

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,13 @@ relative_files = True
121121
exclude_lines =
122122
except InterruptedError:
123123
if __name__ == .__main__.:
124+
# Let's exclude Windows-specific code from coverage.
125+
# To speed up CI, we only run tests on Windows on special branches (like develop/master) and not on regular PRs.
126+
# Still, if we were to include Windows-specific coverage on these branches,
127+
# then Codecov will always misleadingly show on regular PRs to develop
128+
# that coverage dropped when comparing to the base branch.
129+
# Note that the same CI logic applies to macOS tests, there're just no special coverage exclusion patterns
130+
# (as there's no macOS-specific logic anywhere in git-machete, unlike with Windows).
124131
if sys.platform == .win32.:
125132
pragma: no cover
126133
raise UnexpectedMacheteException

0 commit comments

Comments
 (0)