Skip to content

Commit

Permalink
feat: use new graalvm
Browse files Browse the repository at this point in the history
  • Loading branch information
yqrashawn committed May 16, 2022
1 parent ae5dd6f commit e4fd4ec
Show file tree
Hide file tree
Showing 8 changed files with 34 additions and 12 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/build-and-release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,14 @@ jobs:
- name: Setup GraalVM environment
uses: DeLaGuardo/setup-graalvm@master
with:
graalvm-version: "20.3.0.java8"
graalvm-version: "22.1.0.java17"
- uses: actions/cache@v3
id: maven-cache # use this to check for `cache-hit` (`steps.yarn-and-maven-cache.outputs.cache-hit != 'true'`)
with:
path: ~/.m2/
key: ${{ runner.os }}-maven-${{ hashFiles('./deps.edn') }}
restore-keys: |
${{ runner.os }}-maven-
- name: Install native image
run: gu install native-image
- name: Setup Clojure
Expand All @@ -19,9 +26,7 @@ jobs:
lein: latest
- name: Install joker
run: |
wget -q https://github.com/candid82/joker/releases/download/v0.15.7/joker-0.15.7-mac-amd64.zip
mkdir -p /usr/local/opt/joker/bin/
unzip joker-0.15.7-mac-amd64.zip -d /usr/local/opt/joker/bin/
brew install candid82/brew/joker
- name: Checkout Code
uses: actions/checkout@v3.0.1
- name: Install dependencies
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ pom.xml.asc
*~
/.lsp/
/.clj-kondo/.cache/
/.cpcache/
/karabiner-configurator-0.1.0-standalone.build_artifacts.txt
1 change: 1 addition & 0 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
java graalvm-22.1.0+java17
9 changes: 8 additions & 1 deletion CHANGELOG.org
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@ All notable changes to this project will be documented in this file. This change

** Unreleased

[Unreleased Commits]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.2...HEAD
[Unreleased Commits]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.3...HEAD

** 0.5.3 - 2022-05-16

*** Added
- Use graalvm-22.1.0+java17 and clojure 1.11.1. This enables user to build arm binary on their own (#172)

[commits in 0.5.3]: https://github.com/yqrashawn/GokuRakuJoudo/compare/v0.5.2...v0.5.3

** 0.5.2 - 2022-04-25

Expand Down
4 changes: 2 additions & 2 deletions Makefile.local.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
MAKE=make -f Makefile.local
# change below path to graalvm native-image binary file
GRAALVM=/path/to/graalvm-ce-xxxxx-xxx/Contents/Home/bin/native-image
GRAALVM_ARG=-H:+ReportUnsupportedElementsAtRuntime --no-server
GRAALVM_ARG=-H:+ReportUnsupportedElementsAtRuntime --no-server -J-Dclojure.compiler.elide-meta=[:doc :file :line :added] -J-Dclojure.spec.skip-macros=true -Djdk.internal.lambda.eagerlyInitialize=false
JAR_NAME=karabiner-configurator-0.1.0-standalone
TARGET_JAR=target/$(JAR_NAME).jar
all:
Expand All @@ -23,4 +23,4 @@ bin:
test-binary:
# mkdir -p ~/.config/
# cp ./resources/configurations/yqrashawn.edn ~/.config/karabiner.edn
./goku
./goku
6 changes: 6 additions & 0 deletions deps.edn
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{:deps {org.clojure/clojure {:mvn/version "1.11.1"}
org.clojure/tools.cli {:mvn/version "1.0.206"}
me.raynes/fs {:mvn/version "1.4.6"}
cheshire/cheshire {:mvn/version "5.10.2"}
environ/environ {:mvn/version "1.2.0"}
com.github.clj-easy/graal-build-time {:mvn/version "0.1.4"}}}
9 changes: 5 additions & 4 deletions project.clj
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,18 @@
:description "karabiner configuration manager"
:url "http://https://github.com/yqrashawn/GokuRakuJoudo"
:license {:name "GNU General Public License v3.0"
:url "http://www.eclipse.org/legal/epl-v10.html"}
:url "http://www.eclipse.org/legal/epl-v10.html"}
:main karabiner-configurator.core
:aot :all
:dependencies [[org.clojure/clojure "1.10.1"]
:dependencies [[org.clojure/clojure "1.11.1"]
[org.clojure/tools.cli "1.0.206"]
[me.raynes/fs "1.4.6"]
[cheshire "5.10.2"]
[environ "1.2.0"]]
[environ "1.2.0"]
[com.github.clj-easy/graal-build-time "0.1.4"]]
:plugins [[lein-cloverage "1.2.3"]
[lein-environ "1.2.0"]]
:profiles {:dev {:env {:is-dev true}}
:profiles {:dev {:env {:is-dev true}}
:test {:env {:is-dev true}}})


2 changes: 1 addition & 1 deletion src/karabiner_configurator/core.clj
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@
(:version options)
{:action "exit-with-message"
:ok? true
:exit-message "0.5.2"}
:exit-message "0.5.3"}
;; log
(:log options)
{:action "log"
Expand Down

0 comments on commit e4fd4ec

Please sign in to comment.