Skip to content

Commit af33329

Browse files
committed
Upgrade woodpecker config
- Pipeline changed its name to steps. - Default checkout was target branch, conflicting with our fetch. - Spliting fetch and actual tests for readability. - Cannot split apt install as each step runs in a separated - container (clean way would be to create an image with hunspell in it). Also I don't remember why there's those git things here, so let's try without…
1 parent bd6abaa commit af33329

File tree

2 files changed

+36
-4
lines changed

2 files changed

+36
-4
lines changed

.woodpecker.yml

Lines changed: 28 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,37 @@
11
---
22

3-
pipeline:
3+
# `make verifs` only checks changed files, so it make sense only on
4+
# pull requests.
5+
6+
# Also we're using `branch: "$CI_COMMIT_SOURCE_BRANCH"` because the
7+
# default branch name is the target branch, conflicting with the fact
8+
# the Makefile tries to compare the current branch to the target
9+
# branch...
10+
11+
when:
12+
event: pull_request
13+
14+
clone:
15+
git:
16+
image: woodpeckerci/plugin-git
17+
pull: true
18+
settings:
19+
branch: ${CI_COMMIT_SOURCE_BRANCH}
20+
21+
steps:
22+
fetch target branch:
23+
image: python
24+
commands:
25+
- BRANCH="$(make print-BRANCH)"
26+
- git fetch origin --no-tags +refs/heads/$BRANCH
27+
- git branch $BRANCH origin/$BRANCH
28+
- git branch -va
29+
430
test:
531
image: python
632
commands:
733
- apt-get update
834
- apt-get install -y hunspell hunspell-fr-comprehensive
935
- python3 -m pip install -r requirements.txt
10-
- BRANCH="$(grep ^BRANCH Makefile | awk '{print $3}')"
11-
- git fetch origin --no-tags +refs/heads/$BRANCH
12-
- 'git branch $BRANCH origin/$BRANCH ||:'
36+
- make diff
1337
- make verifs

Makefile

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,3 +192,11 @@ clean:
192192
find -name '*.mo' -delete
193193
@echo "Cleaning build directory"
194194
$(MAKE) -C venv/cpython/Doc/ clean
195+
196+
.PHONY: diff
197+
diff:
198+
@echo "Files changed between $(BRANCH) and HEAD:"
199+
@echo $(shell git diff --name-only --diff-filter=d $(BRANCH))
200+
201+
print-%:
202+
@echo $($*)

0 commit comments

Comments
 (0)