Skip to content

Commit

Permalink
.travis.yml: Remove version numbers from PATH line
Browse files Browse the repository at this point in the history
Create and use variables for the versions, so that
the PATH line does not need to be modified so often,
and the merge conflicts that causes.

Use ~/.local/ where possible for installed software,
so that scripts can be reused.

Related to coala#1429
Related to coala#2638
  • Loading branch information
jayvdb committed Jul 25, 2018
1 parent d63fee1 commit a724ad7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 24 deletions.
6 changes: 5 additions & 1 deletion .ci/deps.java.sh
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/bin/sh

set -e
set -x

# PMD commands
if [ ! -e ~/pmd-bin-5.4.1/bin ]; then
PMD_VERSION=5.4.1
if [ ! -e ~/.local/bin/pmd ]; then
wget -nc -O ~/pmd.zip https://github.com/pmd/pmd/releases/download/pmd_releases%2F5.4.1/pmd-bin-5.4.1.zip
unzip ~/pmd.zip -d ~/
cp -r ~/pmd-bin-$PMD_VERSION/* ~/.local/
fi

# Tailor (Swift) commands
Expand Down
2 changes: 2 additions & 0 deletions .ci/deps.opam.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/sh

set -e
set -x

Expand Down
12 changes: 8 additions & 4 deletions .ci/deps.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
#!/bin/bash

set -e
set -x

Expand All @@ -19,19 +21,21 @@ bundle install --path=vendor/bundle --binstubs=vendor/bin --jobs=8 --retry=3
if ! dartanalyzer -v &> /dev/null; then
wget -nc -O ~/dart-sdk.zip https://storage.googleapis.com/dart-archive/channels/stable/release/1.14.2/sdk/dartsdk-linux-x64-release.zip
unzip -n ~/dart-sdk.zip -d ~/
cp -rp ~/dart-sdk/* ~/.local/
fi

# VHDL Bakalint Installation
if [ ! -e ~/bakalint-0.4.0/bakalint.pl ]; then
if [ ! -e ~/.local/bin/bakalint.pl ]; then
BAKALINT_VERSION=0.4.0
wget "http://downloads.sourceforge.net/project/fpgalibre/bakalint/0.4.0/bakalint-0.4.0.tar.gz?r=https%3A%2F%2Fsourceforge.net%2Fprojects%2Ffpgalibre%2Ffiles%2Fbakalint%2F0.4.0%2F&ts=1461844926&use_mirror=netcologne" -O ~/bl.tar.gz
tar xf ~/bl.tar.gz -C ~/
mv ~/bakalint-$BAKALINT_VERSION/bakalint.pl ~/.local/bin/
fi

# elm-format Installation
if [ ! -e ~/elm-format-0.18/elm-format ]; then
mkdir -p ~/elm-format-0.18
if [ ! -e ~/.local/bin/elm-format ]; then
curl -fsSL -o elm-format.tgz https://github.com/avh4/elm-format/releases/download/0.5.2-alpha/elm-format-0.17-0.5.2-alpha-linux-x64.tgz
tar -xvzf elm-format.tgz -C ~/elm-format-0.18
tar -xvzf elm-format.tgz -C ~/.local/bin/
fi

# Julia commands
Expand Down
14 changes: 5 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,23 +151,19 @@ cache:
- $TRAVIS_BUILD_DIR/vendor
# coala managed data
- ~/nltk_data
- ~/.local/share/coala-bears
# Installed linters
- ~/infer-linux64-v0.7.0
- ~/pmd-bin-5.4.1
- ~/bakalint-0.4.0
- ~/elm-format-0.18
- ~/dart-sdk/bin
- ~/.local/tailor/
- ~/.local/bin/
- ~/infer-linux64-v$INFER_VERSION
- ~/.local/

env:
global:
- TERM=dumb
- CIRCLE_NODE_INDEX=-1 # Avoid accidentially being a CircleCI worker
- R_LIB_USER=~/R/Library
- LINTR_COMMENT_BOT=false
- PATH="$HOME/.local/bin:/opt/cabal/1.24/bin:$PATH:$TRAVIS_BUILD_DIR/node_modules/.bin:$TRAVIS_BUILD_DIR/vendor/bin:$HOME/dart-sdk/bin:$HOME/.cabal/bin:$HOME/infer-linux64-v0.7.0/infer/bin:$HOME/pmd-bin-5.4.1/bin:$HOME/bakalint-0.4.0:$HOME/elm-format-0.18:$HOME/.local/tailor/tailor-latest/bin:$HOME/.luarocks/bin"
- CABAL_VERSION=1.24
- INFER_VERSION=0.7.0
- PATH="$HOME/.local/bin:/opt/cabal/$CABAL_VERSION/bin:$PATH:$TRAVIS_BUILD_DIR/node_modules/.bin:$TRAVIS_BUILD_DIR/vendor/bin:$HOME/.cabal/bin:$HOME/infer-linux64-v$INFER_VERSION/infer/bin:$HOME/.local/tailor/tailor-latest/bin:$HOME/.luarocks/bin"

before_install:
- nvm install 6.10.2
Expand Down
11 changes: 1 addition & 10 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,14 @@ dependencies:
- ~/coala-bears/.bundle
- ~/coala-bears/vendor
- ~/.RLibrary
- ~/dart-sdk/bin
- ~/.luarocks/
- ~/.cabal
- ~/.ghc
- ~/.ghc-mod
- ~/infer-linux64-v0.7.0
- ~/nltk_data
- ~/pmd-bin-5.4.1
- ~/.local/share/coala-bears
- ~/bakalint-0.4.0
- ~/.julia
- ~/.local/bin/
- ~/.local/tailor/
- ~/.local/
pre:
- sudo rm -rf /var/cache/apt/archives
- sudo ln -s ~/.apt-cache /var/cache/apt/archives
Expand All @@ -28,14 +23,10 @@ dependencies:
- echo 'export PATH=$PATH:~/coala-bears/node_modules/.bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/coala-bears/vendor/bin' >> ~/.circlerc
- echo 'export LINTR_COMMENT_BOT=false' >> ~/.circlerc
- echo 'export PATH=$PATH:~/dart-sdk/bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/.cabal/bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/.luarocks/bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/infer-linux64-v0.7.0/infer/bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/pmd-bin-5.4.1/bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/bakalint-0.4.0' >> ~/.circlerc
- echo 'export PATH=$PATH:~/.local/tailor/tailor-latest/bin' >> ~/.circlerc
- echo 'export PATH=$PATH:~/elm-format-0.18' >> ~/.circlerc
- echo 'export R_LIB_USER=~/.RLibrary' >> ~/.circlerc
- sed -i '/source \/home\/ubuntu\/virtualenvs\//d' ~/.circlerc
- mkdir -p ~/.RLibrary
Expand Down

0 comments on commit a724ad7

Please sign in to comment.