Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 1.13.21 #458

Merged
merged 4 commits into from
Nov 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,26 @@ lein doc
- Tutorials:
- [Modeling Threat Intelligence in CTIM](doc/tutorials/modeling-threat-intel-ctim.md)

## Releases

```clojure
# snapshot release
lein deploy

# for releases, set project.clj version to x.y.z-SNAPSHOT
# this command then releases as x.y.z and bumps to x.y.(z+1)-SNAPSHOT
# aliased as ./script/release.sh
lein release :patch

# if release fails partway through, use these commands to recover
git tag --delete x.y.z
# you might have a redundant commit "Version x.y.z", undo with:
git reset --hard SHA_BEFORE_FAILED_RELEASE
```

## License

Copyright © 2016-2023 Cisco Systems
Copyright © 2016-2024 Cisco Systems

Distributed under the Eclipse Public License either version 1.0 or (at
your option) any later version.
21 changes: 19 additions & 2 deletions project.clj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(defproject threatgrid/ctim "1.3.21-SNAPSHOT"
(defproject threatgrid/ctim "1.3.22-SNAPSHOT"
:description "Cisco Threat Intelligence Model"
:url "http://github.com/threatgrid/ctim"
:license {:name "Eclipse Public License"
Expand All @@ -24,13 +24,30 @@
:plugins [[lein-cljsbuild "1.1.7"]
[com.google.guava/guava "20.0"] ;resolve internal conflict in `lein-doo`
[lein-doo "0.1.11" :exclusions [org.clojure/clojure]]
;;uncomment for lein-git-down
#_[reifyhealth/lein-git-down "0.3.5"]]

;;uncomment for lein-git-down
;:middleware [lein-git-down.plugin/inject-properties]
;:repositories [["public-github" {:url "git://github.com"}]
; ["private-github" {:url "git://github.com" :protocol :ssh}]]


:release-tasks [["clean"]
["doc"]
;; this command will fail if `lein doc` generates anything new
;; please commit it and try again
["vcs" "assert-committed"]
["change" "version" "leiningen.release/bump-version" "release"]
;; will fail if project.clj doesn't already have -SNAPSHOT version
["vcs" "commit"]
["vcs" "tag" "--no-sign"]
["deploy" "clojars"]
["change" "version" "leiningen.release/bump-version"]
["vcs" "commit"]
;; fails if no upstream branch is defined
;; if it fails at this point you can complete the release using:
;; git push --tags --set-upstream origin release-x.y.z
["vcs" "push"]]

:aliases {"doc" ^{:doc "Generate documentation"} ["run" "-m" "ctim.document"]
"docs" ^{:doc "Generate documentation"} ["doc"]
Expand Down
3 changes: 3 additions & 0 deletions script/release.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/bash
set -xe
lein release :patch
Loading