Skip to content
This repository has been archived by the owner on Mar 8, 2022. It is now read-only.

Commit

Permalink
Merge pull request #1 from Sweetchuck/change-vendor
Browse files Browse the repository at this point in the history
Change vendor
  • Loading branch information
Sweetchuck authored Aug 6, 2017
2 parents 6938a7a + d6a78d8 commit 3b97615
Show file tree
Hide file tree
Showing 30 changed files with 1,070 additions and 874 deletions.
24 changes: 12 additions & 12 deletions .git-hooks
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
#!/usr/bin/env bash

echo "BEGIN Git hook: ${cghHookName}"
echo "BEGIN Git hook: ${sghHookName}"

function cghExit ()
function sghExit ()
{
echo "END Git hook: ${cghHookName}"
echo "END Git hook: ${sghHookName}"

exit $1
}

export COMPOSER_DISABLE_XDEBUG_WARN=1

# @todo Better detection for executables: php, composer.phar.
cghRobo="$(composer config 'bin-dir')/robo"
sghRobo="$(composer config 'bin-dir')/robo"

test -s "${cghBridge}.local" && . "${cghBridge}.local"
test -s "${sghBridge}.local" && . "${sghBridge}.local"

cghTask="githook:${cghHookName}"
sghTask="githook:${sghHookName}"

# Exit without error if "robo" doesn't exists or it has no corresponding task.
test -x "$cghRobo" || cghExit 0
"${cghRobo}" help "${cghTask}" 1> /dev/null 2>&1 || cghExit 0
test -x "$sghRobo" || sghExit 0
"${sghRobo}" help "${sghTask}" 1> /dev/null 2>&1 || sghExit 0

if [ "$cghHasInput" = 'true' ]; then
"$cghRobo" "${cghTask}" $@ <<< $(</dev/stdin) || cghExit $?
if [ "$sghHasInput" = 'true' ]; then
"$sghRobo" "${sghTask}" $@ <<< $(</dev/stdin) || sghExit $?
else
"$cghRobo" "${cghTask}" $@ || cghExit $?
"$sghRobo" "${sghTask}" $@ || sghExit $?
fi

cghExit 0
sghExit 0
12 changes: 5 additions & 7 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,15 @@ matrix:
sudo: false
language: 'php'
php: '7.1'
-
os: 'osx'
language: 'generic'
env:
- >-
BREW_PHP=php71
# -
# os: 'osx'
# language: 'generic'

before_install:
- 'export COMPOSER_NO_INTERACTION=1'
- 'export COMPOSER_DISABLE_XDEBUG_WARN=1'
- "export CUSTOM_RUBY_VERSION=2.3.1"
- 'export BREW_PHP=php71'
- "export CUSTOM_RUBY_VERSION=$(bundle platform --ruby | awk '{print $2}')"
- 'src-dev/scripts/travis/before_install.sh'
- 'rvm install "${CUSTOM_RUBY_VERSION}"'
- 'rvm --default use "${CUSTOM_RUBY_VERSION}"'
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ DEPENDENCIES
compass-validator (>= 3.0.1)

RUBY VERSION
ruby 2.3.1p112
ruby 2.3.1

BUNDLED WITH
1.14.5
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Robo task wrapper for Compass

[![Build Status](https://travis-ci.org/Cheppers/robo-compass.svg?branch=master)](https://travis-ci.org/Cheppers/robo-compass)
[![codecov](https://codecov.io/gh/Cheppers/robo-compass/branch/master/graph/badge.svg)](https://codecov.io/gh/Cheppers/robo-compass)
[![Build Status](https://travis-ci.org/Sweetchuck/robo-compass.svg?branch=master)](https://travis-ci.org/Sweetchuck/robo-compass)
[![codecov](https://codecov.io/gh/Sweetchuck/robo-compass/branch/master/graph/badge.svg)](https://codecov.io/gh/Sweetchuck/robo-compass)

@todo
Loading

0 comments on commit 3b97615

Please sign in to comment.