diff --git a/.travis.yml b/.travis.yml index 9d0853c7..9d1cd3a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,17 +41,13 @@ addons: - redis-tools - zlib1g-dev before_install: - - npm install -g greenkeeper-lockfile@1 - psql -d template1 -U postgres -c "CREATE USER pinafore WITH PASSWORD 'pinafore' CREATEDB;" - curl -o- -L https://yarnpkg.com/install.sh | bash -s - export PATH="$HOME/.yarn/bin:$PATH" - ./bin/setup-mastodon-in-travis.sh -install: yarn # don't allow yarn --pure-lockfile because Greenkeeper needs to update before_script: - yarn run lint - - greenkeeper-lockfile-update after_script: - - greenkeeper-lockfile-upload - rm -f /home/travis/.rvm/gems/ruby-*/bin/posix-spawn-benchmark # file seems generated every time, breaks travis cache script: travis_retry yarn run $COMMAND env: @@ -71,7 +67,6 @@ matrix: branches: only: - master - - /^greenkeeper/.*$/ cache: yarn: true bundler: true diff --git a/README.md b/README.md index 650be928..a0e30247 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Pinafore [![Build Status](https://travis-ci.com/nolanlawson/pinafore.svg?branch=master)](https://travis-ci.com/nolanlawson/pinafore) [![Greenkeeper badge](https://badges.greenkeeper.io/nolanlawson/pinafore.svg)](https://greenkeeper.io/) +# Pinafore [![Build Status](https://travis-ci.com/nolanlawson/pinafore.svg?branch=master)](https://travis-ci.com/nolanlawson/pinafore) An alternative web client for [Mastodon](https://joinmastodon.org), focused on speed and simplicity. diff --git a/package.json b/package.json index bf1162c9..5b9976f1 100644 --- a/package.json +++ b/package.json @@ -174,12 +174,6 @@ "mode": "auto", "cjs": "vars" }, - "greenkeeper": { - "ignore": [ - "sapper", - "svelte" - ] - }, "repository": { "type": "git", "url": "git+https://github.com/nolanlawson/pinafore.git"