From 1b8583fa5150e487cc75de47e5cb0e4c216d37bf Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 Apr 2019 11:25:41 +0100
Subject: [PATCH 1/2] Change jenkins script to package script

Take the useful part of the jenkins script and put it in a script
that makes a package with the git hashes as its version.
---
 scripts/{jenkins.sh => ci_package.sh} | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)
 rename scripts/{jenkins.sh => ci_package.sh} (56%)

diff --git a/scripts/jenkins.sh b/scripts/ci_package.sh
similarity index 56%
rename from scripts/jenkins.sh
rename to scripts/ci_package.sh
index e3a60551..33ac67fe 100755
--- a/scripts/jenkins.sh
+++ b/scripts/ci_package.sh
@@ -1,25 +1,12 @@
 #!/bin/bash
 
+# Runs package.sh setting the version to git hashes of the riot-web,
+# react-sdk & js-sdk checkouts, for the case where these dependencies
+# are git checkouts.
+
 set -e
-
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
-nvm use 10
-
 set -x
 
-# check out corresponding branches of dependencies.
-# clone the deps with depth 1: we know we will only ever need that one commit.
-`dirname $0`/fetch-develop.deps.sh --depth 1
-
-yarn install
-
-# run the mocha tests
-yarn test
-
-# run eslint
-yarn lintall -- -f checkstyle -o eslint.xml || true
-
 rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist
 
 # Since the deps are fetched from git, we can rev-parse

From afc2b480731c0c7bbda86019e836d3981bc9b01e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 26 Apr 2019 12:22:32 +0100
Subject: [PATCH 2/2] combine sets

---
 scripts/ci_package.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/ci_package.sh b/scripts/ci_package.sh
index 33ac67fe..b6daf052 100755
--- a/scripts/ci_package.sh
+++ b/scripts/ci_package.sh
@@ -4,8 +4,7 @@
 # react-sdk & js-sdk checkouts, for the case where these dependencies
 # are git checkouts.
 
-set -e
-set -x
+set -ex
 
 rm dist/riot-*.tar.gz || true # rm previous artifacts without failing if it doesn't exist