mirror of https://github.com/containers/podman.git
Cirrus: add bindings checks
Make sure that bindings are in sync with the code. The check is similar to what's already being done with `make vendor`, so integrate the two. [NO TESTS NEEDED] Signed-off-by: Valentin Rothberg <rothberg@redhat.com>
This commit is contained in:
parent
41a7e11c7e
commit
a3621a7cff
14
.cirrus.yml
14
.cirrus.yml
|
|
@ -274,17 +274,19 @@ swagger_task:
|
||||||
|
|
||||||
|
|
||||||
# Check that all included go modules from other sources match
|
# Check that all included go modules from other sources match
|
||||||
# what is expected in `vendor/modules.txt` vs `go.mod`.
|
# what is expected in `vendor/modules.txt` vs `go.mod`. Also
|
||||||
vendor_task:
|
# make sure that the generated bindings in pkg/bindings/...
|
||||||
name: "Test Vendoring"
|
# are in sync with the code.
|
||||||
alias: vendor
|
consistency_task:
|
||||||
|
name: "Test Code Consistency"
|
||||||
|
alias: consistency
|
||||||
skip: *tags
|
skip: *tags
|
||||||
depends_on:
|
depends_on:
|
||||||
- build
|
- build
|
||||||
container: *smallcontainer
|
container: *smallcontainer
|
||||||
env:
|
env:
|
||||||
<<: *stdenvars
|
<<: *stdenvars
|
||||||
TEST_FLAVOR: vendor
|
TEST_FLAVOR: consistency
|
||||||
TEST_ENVIRON: container
|
TEST_ENVIRON: container
|
||||||
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
|
CTR_FQIN: ${FEDORA_CONTAINER_FQIN}
|
||||||
clone_script: *full_clone # build-cache not available to container tasks
|
clone_script: *full_clone # build-cache not available to container tasks
|
||||||
|
|
@ -642,7 +644,7 @@ success_task:
|
||||||
- validate
|
- validate
|
||||||
- bindings
|
- bindings
|
||||||
- swagger
|
- swagger
|
||||||
- vendor
|
- consistency
|
||||||
- alt_build
|
- alt_build
|
||||||
- static_alt_build
|
- static_alt_build
|
||||||
- osx_alt_build
|
- osx_alt_build
|
||||||
|
|
|
||||||
1
Makefile
1
Makefile
|
|
@ -464,6 +464,7 @@ podman-remote-%-release:
|
||||||
rm -f release.txt
|
rm -f release.txt
|
||||||
$(MAKE) podman-remote-release-$*.zip
|
$(MAKE) podman-remote-release-$*.zip
|
||||||
|
|
||||||
|
.PHONY: generate-bindings
|
||||||
generate-bindings:
|
generate-bindings:
|
||||||
ifneq ($(shell uname -s), Darwin)
|
ifneq ($(shell uname -s), Darwin)
|
||||||
GO111MODULE=off $(GO) generate ./pkg/bindings/... ;
|
GO111MODULE=off $(GO) generate ./pkg/bindings/... ;
|
||||||
|
|
|
||||||
|
|
@ -146,9 +146,11 @@ function _run_swagger() {
|
||||||
cp -v $GOSRC/pkg/api/swagger.yaml $GOSRC/
|
cp -v $GOSRC/pkg/api/swagger.yaml $GOSRC/
|
||||||
}
|
}
|
||||||
|
|
||||||
function _run_vendor() {
|
function _run_consistency() {
|
||||||
make vendor
|
make vendor
|
||||||
./hack/tree_status.sh
|
SUGGESTION="run 'make vendor' and commit all changes" ./hack/tree_status.sh
|
||||||
|
make generate-bindings
|
||||||
|
SUGGESTION="run 'make generate-bindings' and commit all changes" ./hack/tree_status.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
function _run_build() {
|
function _run_build() {
|
||||||
|
|
|
||||||
|
|
@ -214,7 +214,7 @@ case "$TEST_FLAVOR" in
|
||||||
|
|
||||||
install_test_configs
|
install_test_configs
|
||||||
;;
|
;;
|
||||||
vendor) make clean ;;
|
consistency) make clean ;;
|
||||||
release) ;;
|
release) ;;
|
||||||
*) die_unknown TEST_FLAVOR
|
*) die_unknown TEST_FLAVOR
|
||||||
esac
|
esac
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue