diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-01-29 17:30:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-29 17:30:41 -0500 |
| commit | 745fa4ac94c3ec99becd85f59d1b59c2c9765527 (patch) | |
| tree | 63f32aeeb816a637e9406217a4044ff91031cd31 /contrib | |
| parent | b6336071101fe4f19a7826d16f0dd61394678853 (diff) | |
| parent | c1f05be4d7ac31c741a9ea542e284d731c6544a1 (diff) | |
| download | podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.tar.gz podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.tar.bz2 podman-745fa4ac94c3ec99becd85f59d1b59c2c9765527.zip | |
Merge pull request #9163 from mheon/backports_rc2
Backports for v3.0 RC2
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/cirrus/runner.sh | 6 | ||||
| -rwxr-xr-x | contrib/cirrus/setup_environment.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 572f0b44a..6e6747f28 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -142,9 +142,11 @@ function _run_swagger() { cp -v $GOSRC/pkg/api/swagger.yaml $GOSRC/ } -function _run_vendor() { +function _run_consistency() { 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() { diff --git a/contrib/cirrus/setup_environment.sh b/contrib/cirrus/setup_environment.sh index 5c6f05ac0..7b49caba0 100755 --- a/contrib/cirrus/setup_environment.sh +++ b/contrib/cirrus/setup_environment.sh @@ -214,7 +214,7 @@ case "$TEST_FLAVOR" in install_test_configs ;; - vendor) make clean ;; + consistency) make clean ;; release) ;; *) die_unknown TEST_FLAVOR esac |