Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
abcl
abcl
Commits
fcdf60a0
Commit
fcdf60a0
authored
Nov 23, 2019
by
Mark Evenson
Browse files
ci: try even harder to ensure jenv shim is used for build
parent
a9f61673
Changes
4
Hide whitespace changes
Inline
Side-by-side
.travis.yml
View file @
fcdf60a0
...
...
@@ -33,7 +33,7 @@ install:
-
echo $(pwd)
-
bash -x ${TRAVIS_BUILD_DIR}/ci/install-adoptjdk.bash ${ABCL_JDK}
# Build ABCL
-
ant abcl
-
. ${TRAVIS_BUILD_DIR}/ci/ensure-jenv-is-present.bash &&
ant abcl
# Configure finding abcl build source via ASDF
-
bash -x ${TRAVIS_BUILD_DIR}/ci/asdf-finds-abcl.bash
# Install Quicklisp
...
...
ci/ensure-jenv-is-present.bash
View file @
fcdf60a0
#!/bin/bash
#!/usr/bin/env bash
if
[[
$(
echo
$PATH
|
grep
-c
.jenv
)
-eq
0
]]
;
then
export
PATH
=
"
$HOME
/.jenv/bin:
$PATH
"
fi
eval
"
$(
jenv init -
)
"
ci/install-adoptjdk.bash
View file @
fcdf60a0
#!/usr/bin/env bash
DIR
=
"
$(
cd
-P
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&&
pwd
)
"
source
${
DIR
}
/install-jenv.bash
.
${
DIR
}
/install-jenv.bash
jdk
=
$1
...
...
@@ -63,32 +63,16 @@ function add_jdk() {
esac
}
function
set_jdk
()
{
.
${
DIR
}
/ensure-jenv-is-present.bash
jenv versions
case
${
ABCL_JDK
}
in
openjdk8
)
version
=
$(
jenv versions |
grep
openjdk |
grep
1.8 |
tail
-1
|
sed
s/
*
//
)
;;
openjdk11
)
version
=
$(
jenv versions |
grep
openjdk |
grep
11.0 |
tail
-1
|
sed
s/
*
//
)
;;
esac
pushd
${
TRAVIS_BUILD_DIR
}
jenv
local
${
version
}
# but practically we guard every invocation of jenv this way
jenv global
${
version
}
popd
}
# grab the set_jdk routine
.
set-jdk.bash
determine_adoptjdk
download_and_extract
add_jdk
set_jdk
jenv
.
${
DIR
}
/set_jdk.bash
...
...
ci/install-jenv.bash
View file @
fcdf60a0
...
...
@@ -7,12 +7,6 @@ if [[ ! -r "${target}" ]]; then
git clone https://github.com/jenv/jenv.git
"
${
target
}
"
fi
# FIXME: don't always run the init routines?
profile
=
~/.bash_profile
echo
'export PATH="$HOME/.jenv/bin:$PATH"'
>>
${
profile
}
echo
'eval "$(jenv init -)"'
>>
${
profile
}
.
${
profile
}
.
${
DIR
}
/ensure-jenv-is-present.bash
jenv enable-plugin ant
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment