From dd349e2ae3e2e5ea2dbc097db58ba3e7ebfebcb9 Mon Sep 17 00:00:00 2001 From: Nolan Lawson Date: Sat, 8 Dec 2018 12:46:00 -0800 Subject: [PATCH] chore(tests): update mastodon to v2.6.5 (#764) * chore(tests): update mastodon to v2.6.5 * fix for travis cache of mastodon git repo --- bin/run-mastodon.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/run-mastodon.js b/bin/run-mastodon.js index f7a5967..f6cac2f 100644 --- a/bin/run-mastodon.js +++ b/bin/run-mastodon.js @@ -14,7 +14,7 @@ const writeFile = pify(fs.writeFile.bind(fs)) const dir = __dirname const GIT_URL = 'https://github.com/tootsuite/mastodon.git' -const GIT_TAG = 'v2.6.1' +const GIT_TAG = 'v2.6.5' const DB_NAME = 'pinafore_development' const DB_USER = 'pinafore' @@ -43,6 +43,7 @@ async function cloneMastodon () { } catch (e) { console.log('Cloning mastodon...') await exec(`git clone --single-branch --branch master ${GIT_URL} "${mastodonDir}"`) + await exec(`git fetch origin --tags`, { cwd: mastodonDir }) // may already be cloned, e.g. in CI await exec(`git checkout ${GIT_TAG}`, { cwd: mastodonDir }) await writeFile(path.join(dir, '../mastodon/.env'), envFile, 'utf8') }