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.

Sign up for GitHub

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

Fix detection of clojure version #2

Merged
merged 6 commits into from
Dec 27, 2019
Merged

Fix detection of clojure version #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c80bc17
debug
borkdude Dec 26, 2019
24cb601
debug
borkdude Dec 26, 2019
01d4257
fix install clojure
borkdude Dec 26, 2019
1ac50d9
Install clojure
borkdude Dec 26, 2019
fbbe617
Remove debug
borkdude Dec 26, 2019
b961e16
v0.0.2
borkdude Dec 27, 2019
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
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ jobs:
- run:
name: Install Clojure
command: |
wget -nc https://download.clojure.org/install/linux-install-1.10.1.447.sh
chmod +x linux-install-1.10.1.447.sh
sudo ./linux-install-1.10.1.447.sh
wget -nc https://download.clojure.org/install/linux-install-1.10.1.492.sh
chmod +x linux-install-1.10.1.492.sh
sudo ./linux-install-1.10.1.492.sh
# - run:
# name: Run JVM tests
# command: |
Expand Down Expand Up @@ -67,9 +67,9 @@ jobs:
- run:
name: Install Clojure
command: |
wget https://download.clojure.org/install/linux-install-1.10.1.447.sh
chmod +x linux-install-1.10.1.447.sh
sudo ./linux-install-1.10.1.447.sh
wget https://download.clojure.org/install/linux-install-1.10.1.492.sh
chmod +x linux-install-1.10.1.492.sh
sudo ./linux-install-1.10.1.492.sh
- run:
name: Install lsof
command: |
Expand Down
6 changes: 3 additions & 3 deletions .circleci/script/install-clojure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
install_dir=${1:-/tmp/clojure}
mkdir -p "$install_dir"
cd /tmp
curl -O -sL https://download.clojure.org/install/clojure-tools-1.10.1.447.tar.gz
tar xzf clojure-tools-1.10.1.447.tar.gz
curl -O -sL https://download.clojure.org/install/clojure-tools-1.10.1.492.tar.gz
tar xzf clojure-tools-1.10.1.492.tar.gz
cd clojure-tools
clojure_lib_dir="$install_dir/lib/clojure"
mkdir -p "$clojure_lib_dir/libexec"
Expand All @@ -18,6 +18,6 @@ cp clojure "$install_dir/bin"
cp clj "$install_dir/bin"

cd /tmp
rm -rf clojure-tools-1.10.1.447.tar.gz
rm -rf clojure-tools-1.10.1.492.tar.gz
rm -rf clojure-tools
echo "Installed clojure to $install_dir/bin"
2 changes: 1 addition & 1 deletion resources/DEPS_CLJ_VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.0.2-SNAPSHOT
0.0.2
2 changes: 2 additions & 0 deletions script/compile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ fi

DEPS_CLJ_VERSION=$(cat resources/DEPS_CLJ_VERSION)

lein deps.clj -Spath -Sdeps '{:deps {borkdude/deps.clj {:mvn/version "0.0.1"}}}'

lein do clean, uberjar

$NATIVE_IMAGE \
Expand Down