Skip to content

Commit

Permalink
CI: Use cs50/ppa for astyle 3.0.1
Browse files Browse the repository at this point in the history
Closes coala#2302
Related to coala#2592
  • Loading branch information
jayvdb committed Jul 8, 2018
1 parent ff6dab7 commit 703f0dc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 8 deletions.
3 changes: 2 additions & 1 deletion .ci/deps.apt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -x
# apt-get commands
export DEBIAN_FRONTEND=noninteractive

deps="libclang1-3.4 indent mono-mcs chktex r-base julia golang-go luarocks verilator cppcheck flawfinder devscripts mercurial"
deps="libclang1-3.4 astyle indent mono-mcs chktex r-base julia golang-go luarocks verilator cppcheck flawfinder devscripts mercurial"
deps_infer="m4 opam"

case $CIRCLE_BUILD_IMAGE in
Expand Down Expand Up @@ -43,6 +43,7 @@ if [ -n "$ADD_APT_UBUNTU_RELEASE" ]; then
fi

if [ "$USE_PPAS" = "true" ]; then
sudo add-apt-repository -y ppa:cs50/ppa
sudo add-apt-repository -y ppa:marutter/rdev
sudo add-apt-repository -y ppa:staticfloat/juliareleases
sudo add-apt-repository -y ppa:staticfloat/julia-deps
Expand Down
6 changes: 0 additions & 6 deletions .ci/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,3 @@ if [ ! -e ~/phpmd/phpmd ]; then
sudo chmod +x phpmd.phar
sudo mv phpmd.phar ~/phpmd/phpmd
fi

# astyle installation
wget "https://downloads.sourceforge.net/project/astyle/astyle/astyle%203.0.1/astyle_3.0.1_linux.tar.gz?r=&ts=1499017588&use_mirror=excellmedia" -O ~/astyle.tar.gz
tar -xvzf ~/astyle.tar.gz -C ~/
make -C ~/astyle/build/gcc
sudo make install -C ~/astyle/build/gcc
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ env:
global:
- TERM=dumb
- CIRCLE_NODE_INDEX=-1 # Avoid accidentially being a CircleCI worker
- USE_PPAS="marutter/rdev staticfloat/juliareleases ondrej/golang"
- USE_PPAS="marutter/rdev staticfloat/juliareleases ondrej/golang cs50/ppa"
- R_LIB_USER=~/R/Library
- LINTR_COMMENT_BOT=false
- PATH="/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/phpmd"
Expand Down

0 comments on commit 703f0dc

Please sign in to comment.