Skip to content

Commit

Permalink
Review feedback from lrytz
Browse files Browse the repository at this point in the history
  • Loading branch information
adriaanm committed Mar 7, 2018
1 parent 9f54360 commit 8fc5de2
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 9 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ before_script:
- (cd admin && ./init.sh)

stages:
- name: build
- name: build # also builds the spec using jekyll
- name: test
if: type != pull_request
- name: publish
Expand Down
5 changes: 0 additions & 5 deletions admin/init.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,10 @@ sensitive() {
perl -p -e 's/\$\{([^}]+)\}/defined $ENV{$1} ? $ENV{$1} : $&/eg' < files/credentials-private-repo > ~/.credentials-private-repo
perl -p -e 's/\$\{([^}]+)\}/defined $ENV{$1} ? $ENV{$1} : $&/eg' < files/credentials-sonatype > ~/.credentials-sonatype
perl -p -e 's/\$\{([^}]+)\}/defined $ENV{$1} ? $ENV{$1} : $&/eg' < files/sonatype-curl > ~/.sonatype-curl
# perl -p -e 's/\$\{([^}]+)\}/defined $ENV{$1} ? $ENV{$1} : $&/eg' < files/m2-settings.xml > ~/.m2/settings.xml -- not needed anymore (used for ide integration?)

openssl aes-256-cbc -d -pass "pass:$GPG_SUBKEY_SECRET" -in files/gpg_subkey.enc | gpg --import
}

# directories needed by sensitive part
# mkdir -p ~/.m2 -- not needed anymore (used for ide integration?)
mkdir -p ~/.ssh

# don't let anything escape from the sensitive part (e.g. leak environment var by echoing to log on failure)
sensitive >/dev/null 2>&1

Expand Down
3 changes: 0 additions & 3 deletions scripts/common
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ set -e

WORKSPACE="${WORKSPACE-`pwd`}"

# the default (home dir) is fine on Travis, since each jobs gets its own worker (ivy cache is cached by travis)
IVY_HOME="${IVY_HOME-$HOME/.ivy2}"

# Known problems : does not fare well with interrupted, partial
# compilations. We should perhaps have a multi-dependency version
# of do_i_have below
Expand Down

0 comments on commit 8fc5de2

Please sign in to comment.