From cb09da0f635f03ed1a6a5113e0a3dcd7d2f09cc2 Mon Sep 17 00:00:00 2001
From: Daniel Gasienica <daniel@signal.org>
Date: Mon, 7 May 2018 15:53:20 -0400
Subject: [PATCH] Run all build steps in CI

---
 .prettierignore | 5 ++++-
 .travis.yml     | 3 +--
 appveyor.yml    | 3 +--
 package.json    | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index f2403751a06f..c7b5de7190ab 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -2,16 +2,19 @@
 # supports `.gitignore`: https://github.com/prettier/prettier/issues/2294
 
 # Generated files
+config/local-*.json
+config/local.json
 dist/**
 js/components.js
 js/libsignal-protocol-worker.js
 js/libtextsecure.js
 libtextsecure/components.js
 libtextsecure/test/test.js
+stylesheets/*.css
 test/test.js
 ts/**/*.js
-ts/protobuf/*.js
 ts/protobuf/*.d.ts
+ts/protobuf/*.js
 
 # Third-party files
 components/**
diff --git a/.travis.yml b/.travis.yml
index 96730e76c275..b56c17dd6340 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,10 @@ dist: trusty
 install:
   - yarn install --frozen-lockfile
 script:
-  - yarn transpile
+  - yarn generate
   - yarn lint
   - yarn test-node
   - yarn nsp check
-  - yarn generate
   - yarn prepare-beta-build
   - $(yarn bin)/build --config.extraMetadata.environment=$SIGNAL_ENV --config.mac.bundleVersion='$TRAVIS_BUILD_NUMBER' --publish=never
   - ./travis.sh
diff --git a/appveyor.yml b/appveyor.yml
index 52dac757c0d7..1ba2bac72a13 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -12,11 +12,10 @@ install:
   - yarn install --frozen-lockfile
 
 build_script:
-  - yarn transpile
+  - yarn generate
   - yarn lint-windows
   - yarn test-node
   - yarn nsp check
-  - yarn generate
   - node build\grunt.js
   - type package.json | findstr /v certificateSubjectName > temp.json
   - move temp.json package.json
diff --git a/package.json b/package.json
index 1af087b47d29..ea9ec7bec3be 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "start": "electron .",
     "grunt": "grunt",
     "icon-gen": "electron-icon-maker --input=images/icon_1024.png --output=./build",
-    "generate": "npm run icon-gen && grunt",
+    "generate": "yarn icon-gen && yarn grunt",
     "build": "build  --config.extraMetadata.environment=$SIGNAL_ENV",
     "build-release": "SIGNAL_ENV=production npm run build -- --config.directories.output=release",
     "build-protobuf": "pbjs --target static-module --wrap commonjs --out ts/protobuf/SignalService.js protos/SignalService.proto && pbts --out ts/protobuf/SignalService.d.ts ts/protobuf/SignalService.js",