Skip to content

Commit

Permalink
Rename is-pr to pull-request-p
Browse files Browse the repository at this point in the history
  • Loading branch information
neil-lindquist committed Jul 17, 2019
1 parent eb20ddb commit 70ad11f
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/ci-utils.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#:platform
#:build-dir
#:branch
#:is-pr
#:pull-request-p

#:unknown-ci-platform

Expand Down Expand Up @@ -41,7 +41,7 @@
(use-cwd () (uiop:getcwd))))


(defun is-pr ()
(defun pull-request-p ()
"Returns whether the build is for a pull/merge request"
#+travis-ci (not (string= "false" (uiop:getenv "TRAVIS_PULL_REQUEST")))
#+circleci (not (null (uiop:getenvp "CIRCLE_PULL_REQUESTS")))
Expand Down
10 changes: 5 additions & 5 deletions t/tests.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,31 @@
(is (eq :travis-ci (platform)))
(is (string= (uiop:getenv "TRAVIS_BRANCH") (branch)))
(is (eq (not (null (uiop:getenvp "TRAVIS_PULL_REQUEST_BRANCH")))
(is-pr))))
(pull-request-p))))

(test :circleci-tests
(is-true (member :circleci *features*))
(is-false (member :travis-ci *features*))
(is (eq :circleci (platform)))
(is (string= (uiop:getenv "CIRCLE_BRANCH") (branch)))
(is (eq (not (null (uiop:getenvp "CIRCLE_PULL_REQUEST")))
(is-pr))))
(pull-request-p))))

(test :appveyor-tests
(is-true (member :appveyor *features*))
(is-false (member :circleci *features*))
(is (eq :appveyor (platform)))
(is (string= (uiop:getenv "APPVEYOR_REPO_BRANCH") (branch)))
(is (eq (not (null (uiop:getenvp "APPVEYOR_PULL_REQUEST_NUMBER")))
(is-pr))))
(pull-request-p))))

(test :gitlab-ci-tests
(is-true (member :gitlab-ci *features*))
(is-false (member :circleci *features*))
(is (eq :gitlab-ci (platform)))
(is (string= (uiop:getenv "CI_COMMIT_REF_NAME") (branch)))
(is (eq (not (null (uiop:getenvp "CI_MERGE_REQUEST_ID")))
(is-pr))))
(pull-request-p))))

(test :user-tests
(is-true (member :not-ci *features*))
Expand All @@ -48,7 +48,7 @@
(is-false (cip))
(signals unknown-ci-platform (platform))
(signals unknown-ci-platform (build-dir))
(is-false (is-pr))
(is-false (pull-request-p))
(signals unknown-ci-platform (branch)))


Expand Down

0 comments on commit 70ad11f

Please sign in to comment.