Skip to content

Commit dd1c284

Browse files
committed
Update CI files
1 parent 40c7af9 commit dd1c284

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

.ci/scripts/validate_commit_message.py

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
r"^DO\s*NOT\s*MERGE",
2525
r"^EXPERIMENT",
2626
r"^FIXUP",
27-
r"Apply suggestions from code review",
27+
r"^fixup!", # This is created by 'git commit --fixup'
28+
r"Apply suggestions from code review", # This usually comes from GitHub
2829
]
2930
try:
3031
CHANGELOG_EXTS = [
@@ -40,7 +41,11 @@
4041
if NOISSUE_MARKER in message:
4142
sys.exit(f"Do not add '{NOISSUE_MARKER}' in the commit message.")
4243

43-
if any((re.match(pattern, message, re.IGNORECASE) for pattern in BLOCKING_REGEX)):
44+
blocking_matches = [m for m in (re.match(pattern, message) for pattern in BLOCKING_REGEX) if m]
45+
if blocking_matches:
46+
print("Found these phrases in the commit message:")
47+
for m in blocking_matches:
48+
print(" - " + m.group(0))
4449
sys.exit("This PR is not ready for consumption.")
4550

4651
g = Github(os.environ.get("GITHUB_TOKEN"))

.github/template_gitref

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2021.08.26-420-gf332a34
1+
2021.08.26-423-g87f69ce

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
jobs:
1414
test:
1515
if: "endsWith(github.base_ref, 'main')"
16-
runs-on: "ubuntu-20.04"
16+
runs-on: "ubuntu-latest"
1717
defaults:
1818
run:
1919
working-directory: "pulp_python"
@@ -48,7 +48,7 @@ jobs:
4848
4949
no-test:
5050
if: "!endsWith(github.base_ref, 'main')"
51-
runs-on: "ubuntu-20.04"
51+
runs-on: "ubuntu-latest"
5252
steps:
5353
- run: |
5454
echo "Skip docs testing on non-main branches."

0 commit comments

Comments
 (0)