Skip to content

Commit 088b5b1

Browse files
aw-was-herervs
authored andcommitted
Upgrade to Apache Yetus 0.13.0
Signed-off-by: Allen Wittenauer <[email protected]>
1 parent 36075f1 commit 088b5b1

File tree

8 files changed

+36
-176
lines changed

8 files changed

+36
-176
lines changed

.circleci/config.yml

-23
Original file line numberDiff line numberDiff line change
@@ -49,32 +49,9 @@ jobs:
4949
mkdir circle ; cp dist/amd64/installer/*.squash circle
5050
- store_artifacts:
5151
path: circle
52-
yetus:
53-
docker:
54-
- image: apache/yetus:0.12.0
55-
steps:
56-
- checkout
57-
# create a fake artifact so that Apache Yetus knows the URL
58-
- run:
59-
name: make artifact dir
60-
command: mkdir -p /tmp/yetus-out
61-
- run:
62-
name: bootstrap artifacts
63-
command: echo "bootstrap" > /tmp/yetus-out/bootstrap
64-
- store_artifacts:
65-
path: /tmp/yetus-out
66-
# now actually run Apache Yetus precommit
67-
- run:
68-
name: yetus
69-
command: make yetus
70-
- store_test_results:
71-
path: /tmp/yetus-out
72-
- store_artifacts:
73-
path: /tmp/yetus-out
7452
workflows:
7553
version: 2.1
7654
build-stuff:
7755
jobs:
78-
- yetus
7956
- test
8057
- build

.github/workflows/yetus.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
fetch-depth: 0
2323

2424
- name: Yetus
25-
uses: apache/yetus-test-patch-action@main
25+
uses: apache/yetus-test-patch-action@0.13.0
2626
with:
2727
basedir: ./src
2828
bufbasedir: api/proto

.yetus/personality.sh

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
#!/usr/bin/env bash
2+
3+
# shellcheck disable=SC2034
4+
personality_globals() {
5+
6+
# at some point, we should wire up make but
7+
# for now this is fine
8+
BUILDTOOL=nobuild
9+
10+
# configure buf
11+
BUF_BASEDIR=api/proto
12+
13+
# we want this on so master does not break
14+
CONTINUOUS_IMPROVEMENT=true
15+
16+
# set the project name for reports, etc
17+
PROJECT="eve"
18+
19+
# configure revive
20+
REVIVE_CONFIG=.revive.toml
21+
22+
delete_test_type asflicense
23+
delete_test_type author
24+
delete_test_type findbugs
25+
delete_test_type gitlab
26+
delete_test_type jira
27+
delete_test_type shelldocs
28+
delete_test_type spotbugs
29+
30+
}

Makefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,11 @@ clean:
243243

244244
yetus:
245245
@echo Running yetus
246-
build-tools/src/yetus/test-patch.sh
246+
docker run -it --rm -v $(CURDIR):/src:delegated -v /tmp:/tmp apache/yetus:0.13.0 \
247+
--basedir=/src \
248+
--dirty-workspace \
249+
--empty-patch \
250+
--plugins=all
247251

248252
build-tools: $(LINUXKIT)
249253
@echo Done building $<

build-tools/src/yetus/Dockerfile

-3
This file was deleted.

build-tools/src/yetus/test-patch.sh

-75
This file was deleted.

build-tools/src/yetus/yetus-docker-bootstrap.sh

-7
This file was deleted.

build-tools/src/yetus/yetus-wrapper.sh

-66
This file was deleted.

0 commit comments

Comments
 (0)