Skip to content

Commit 69a0f48

Browse files
alexander-yakushevbbatsov
authored andcommitted
[ci] Replace deploy-release script with make task
1 parent 3da6dd6 commit 69a0f48

File tree

5 files changed

+10
-53
lines changed

5 files changed

+10
-53
lines changed

.circleci/config.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,7 @@ jobs:
125125
- checkout
126126
- run:
127127
name: Deploy
128-
command: |
129-
lein with-profile -user,+deploy run -m deploy-release make deploy
128+
command: make deploy
130129

131130
test:
132131
description: |

.circleci/deploy/deploy_release.clj

Lines changed: 0 additions & 39 deletions
This file was deleted.

Makefile

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,14 @@ detect_timeout:
8888
# Deployment is performed via CI by creating a git tag prefixed with "v".
8989
# Please do not deploy locally as it skips various measures (particularly around mranderson).
9090
deploy: check-env target/srcdeps
91+
@if ! echo "$(CIRCLE_TAG)" | grep -q "^v"; then \
92+
echo "[Error] CIRCLE_TAG $(CIRCLE_TAG) must start with 'v'."; \
93+
exit 1; \
94+
fi
9195
rm -f .no-mranderson
92-
lein with-profile -user,+$(CLOJURE_VERSION),+plugin.mranderson/config deploy clojars
96+
export PROJECT_VERSION=$$(echo "$(CIRCLE_TAG)" | sed 's/^v//'); \
97+
echo "$$PROJECT_VERSION" > resources/cider/nrepl/version.edn
98+
lein with-profile -user,-dev,-provided,+$(CLOJURE_VERSION),+plugin.mranderson/config deploy clojars
9399

94100
check-env:
95101
ifndef CLOJARS_USERNAME

project.clj

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,6 @@
7676
~(clojure.java.io/as-relative-path
7777
(clojure.java.io/file "doc" "modules" "ROOT" "pages" "nrepl-api" "ops.adoc"))]}
7878

79-
:release-tasks [["vcs" "assert-committed"]
80-
["bump-version" "release"]
81-
["vcs" "commit" "Release %s"]
82-
["vcs" "tag" "v" "--no-sign"]
83-
["bump-version"]
84-
["vcs" "commit" "Begin %s"]]
85-
8679
:deploy-repositories [["clojars" {:url "https://clojars.org/repo"
8780
:username :env/clojars_username
8881
:password :env/clojars_password
@@ -148,6 +141,4 @@
148141
:eastwood [:test
149142
{:plugins [[jonase/eastwood "1.4.3"]]
150143
:eastwood {:config-files ["eastwood.clj"]
151-
:exclude-namespaces [cider.nrepl.middleware.test-filter-tests cider.tasks]}}]
152-
153-
:deploy {:source-paths [".circleci/deploy"]}})
144+
:exclude-namespaces [cider.nrepl.middleware.test-filter-tests cider.tasks]}}]})

resources/cider/nrepl/version.edn

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
;; This file is automatically overwriten from .circleci/deploy/deploy_release.clj,
1+
;; This file is automatically overwriten by `make deploy` job
22
;; whenever we perform a deployment.
33
"0.0.0"

0 commit comments

Comments
 (0)