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

Update Travis CI configuration #89

Closed
wants to merge 2 commits into from
Closed

Update Travis CI configuration #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a245d7
Update Travis CI configuration
mdickinson May 18, 2021
c0adaf9
Specify platform explicitly
mdickinson May 18, 2021
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
9 changes: 5 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
language: generic
sudo: false
dist: xenial
services:
- xvfb

env:
global:
- INSTALL_EDM_VERSION=1.9.2
- INSTALL_EDM_VERSION=3.2.3
PYTHONUNBUFFERED="1"


Expand Down Expand Up @@ -39,8 +42,6 @@ cache:
before_install:
- mkdir -p "${HOME}/.cache/download"
- export PATH="/usr/lib/ccache/usr/local/bin:${HOME}/edm/bin:${PATH}"
- export DISPLAY=:99.0
- sh -e /etc/init.d/xvfb start
- ccache -s
install:
- ./install-edm-linux.sh
Expand Down
2 changes: 1 addition & 1 deletion etstool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ def install(runtime, toolkit, environment, enaml, source):
assert len(parameters['pip_packages']) == 0
# edm commands to setup the development environment
commands = [
"edm environments create {environment} --force --version={runtime}",
"edm environments create {environment} --force --version={runtime} --platform=rh6-x86_64",
"edm install -y -e {environment} {test_packages} {edm_packages}",
"edm run -e {environment} -- pip install ."
]
Expand Down
4 changes: 2 additions & 2 deletions install-edm-linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ set -e

install_edm() {
local EDM_MAJOR_MINOR="$(echo "$INSTALL_EDM_VERSION" | sed -E -e 's/([[:digit:]]+\.[[:digit:]]+)\..*/\1/')"
local EDM_PACKAGE="edm_${INSTALL_EDM_VERSION}_linux_x86_64.sh"
local EDM_PACKAGE="edm_cli_${INSTALL_EDM_VERSION}_linux_x86_64.sh"
local EDM_INSTALLER_PATH="${HOME}/.cache/download/${EDM_PACKAGE}"

if [ ! -e "$EDM_INSTALLER_PATH" ]; then
curl -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/rh5_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}"
curl -o "$EDM_INSTALLER_PATH" -L "https://package-data.enthought.com/edm/rh6_x86_64/${EDM_MAJOR_MINOR}/${EDM_PACKAGE}"
fi

bash "$EDM_INSTALLER_PATH" -b -p "${HOME}/edm"
Expand Down