Skip to content

Commit 374c791

Browse files
committed
fix #14 version flag
1 parent ecacc58 commit 374c791

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

.github/workflows/publish.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,15 @@ jobs:
4747
- name: build ${{ matrix.config.name }}
4848
if: matrix.config.profile == 'jar'
4949
run: |
50-
lein set-version ${{ github.ref_name }}
50+
VERSION=${GITHUB_REF_NAME#v}
51+
lein set-version $VERSION
5152
lein uberjar
5253
5354
- name: build ${{ matrix.config.name }}
5455
if: matrix.config.profile != 'jar'
5556
run: |
56-
lein set-version ${{ github.ref_name }}
57+
VERSION=${GITHUB_REF_NAME#v}
58+
lein set-version $VERSION
5759
lein native-image
5860
5961
- name: move jar ${{ matrix.config.name }}

project.clj

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
(defproject mobdap "0.1.3"
1+
(defproject mobdap "0.1.4"
22
:description "Debug Adapter for MobDap"
33
:url "https://github.com/atomicptr/mobdap"
44
:license {:name "GPL-3.0-or-later" :url "https://www.gnu.org/licenses/gpl-3.0.en.html"}
@@ -20,16 +20,24 @@
2020
"--no-fallback"
2121
"--parallelism=32"
2222
"--initialize-at-build-time"]}
23-
:profiles {:default {:main ^:skip-aot mobdap.main}
23+
:profiles {:default
24+
{:main ^:skip-aot mobdap.main
25+
:set-version {:updates [{:path "src/mobdap/main.clj"
26+
:search-regex #"mobdap-version \"\d+\.\d+\.\d+(-\w+)?\""
27+
:replace-regex #"\d+\.\d+\.\d+(-\w+)?"}]}}
2428

25-
:dev {:main ^:skip-aot mobdap.dev
26-
:source-paths ["src" "dev"]
27-
:dependencies [[nrepl/nrepl "1.3.1"]]}
29+
:dev
30+
{:main ^:skip-aot mobdap.dev
31+
:source-paths ["src" "dev"]
32+
:dependencies [[nrepl/nrepl "1.3.1"]]}
2833

29-
:test {:dependencies [[nubank/matcher-combinators "3.9.1"]]}
34+
:test
35+
{:dependencies [[nubank/matcher-combinators "3.9.1"]]}
3036

31-
:uberjar {:aot :all
32-
:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}
37+
:uberjar
38+
{:aot :all
39+
:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}
3340

34-
:native-image {:aot :all
35-
:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}})
41+
:native-image
42+
{:aot :all
43+
:jvm-opts ["-Dclojure.compiler.direct-linking=true"]}})

src/mobdap/main.clj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
(println)
2626
(println (:summary result)))
2727

28+
(def ^:private mobdap-version "0.1.4")
29+
2830
(defn -main [& args]
2931
(let [res (parse-opts args cli-options)]
3032
(cond
@@ -40,7 +42,7 @@
4042
(get-in res [:options :help]) (print-usage res)
4143

4244
; --version
43-
(get-in res [:options :version]) (println (System/getProperty "mobdap.version"))
45+
(get-in res [:options :version]) (println mobdap-version)
4446

4547
; run the app
4648
:else

0 commit comments

Comments
 (0)