containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #22033 from Luap99/validate-test-included 

Makefile: drop tests-included from validate target
This commit is contained in:
openshift-merge-bot[bot] 2024-03-13 19:39:41 +00:00 committed by GitHub
parent 358ac20a1e dbf38779bd
commit 075bf503ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -310,7 +310,7 @@ codespell:
codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"*.fish,RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L secon,passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w codespell -S bin,vendor,.git,go.sum,.cirrus.yml,"*.fish,RELEASE_NOTES.md,*.xz,*.gz,*.ps1,*.tar,swagger.yaml,*.tgz,bin2img,*ico,*.png,*.1,*.5,copyimg,*.orig,apidoc.go" -L secon,passt,bu,hastable,te,clos,ans,pullrequest,uint,iff,od,seeked,splitted,marge,erro,hist,ether,specif -w
.PHONY: validate .PHONY: validate
validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-included tests-expect-exit pr-removes-fixed-skips validate: lint .gitvalidation validate.completions man-page-check swagger-check tests-expect-exit pr-removes-fixed-skips
.PHONY: build-all-new-commits .PHONY: build-all-new-commits
build-all-new-commits: build-all-new-commits:

7
contrib/cirrus/runner.sh
View File

@ -22,10 +22,6 @@ source $(dirname $0)/lib.sh
showrun echo "starting" showrun echo "starting"
function _run_validate() { function _run_validate() {
# TODO: aarch64 images need python3-devel installed
# https://github.com/containers/automation_images/issues/159
showrun bigto ooe.sh dnf install -y python3-devel
# git-validation tool fails if $EPOCH_TEST_COMMIT is empty # git-validation tool fails if $EPOCH_TEST_COMMIT is empty
# shellcheck disable=SC2154 # shellcheck disable=SC2154
if [[ -n "$EPOCH_TEST_COMMIT" ]]; then if [[ -n "$EPOCH_TEST_COMMIT" ]]; then
@ -33,7 +29,8 @@ function _run_validate() {
else else
warn "Skipping git-validation since \$EPOCH_TEST_COMMIT is empty" warn "Skipping git-validation since \$EPOCH_TEST_COMMIT is empty"
fi fi
# make sure PRs have tests
showrun make tests-included
} }
function _run_unit() { function _run_unit() {