Skip to content
This repository has been archived by the owner on Mar 30, 2021. It is now read-only.

Ci build #69

Merged
merged 2 commits into from
Jun 23, 2017
Merged

Ci build #69

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
614e19c
Add CI
Jun 22, 2017
433b8e5
rm locals.json chache
Jun 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
language: node_js
node_js:
- "7"
dist: trusty
cache:
yarn: true
directories:
- node_modules

before_script:
- export DISPLAY=:99.0
- export LIGHTHOUSE_CHROMIUM_PATH="$(pwd)/chrome-linux/chrome"
- sh -e /etc/init.d/xvfb start
- curl -L https://raw.githubusercontent.com/GoogleChrome/lighthouse/master/lighthouse-core/scripts/download-chrome.sh | bash

script:
- yarn run export
- yarn test
8 changes: 4 additions & 4 deletions config/locals.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"title": "Etcher",
"prefix": "",
"slogan": "Burn. Better.",
"lead": "Burn images to SD cards & USB drives, safe & easy.",
"lead": "Burn images to SD cards & USB drives, safely and easily.",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ahh, sorry I forgot to commit the changes to this file too, but that's because I was using the GH web-editor rather than building locally :-/

To prevent similar slip-ups in future, I guess you could run git status -s after running yarn run export and checking that git-status returns an empty string (i.e. none of the files in the repo got modified). See e.g. https://github.com/resin-io/etcher/blob/master/scripts/ci/ensure-staged-shrinkwrap.sh

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yea, we actually don't need that file in the git history. It's just used as cache at build time, I'll rm it.

"logo": "logo.png",
"screenshot": "screenshot-1x.gif",
"typekitId": "lzw7tre",
Expand Down Expand Up @@ -68,16 +68,16 @@
{
"title": "Cross Platform",
"image": "cross-platform",
"meta": "Works for everyone,</br> no more complicated install instructions."
"meta": "Works for everyone,<br/>no more complicated install instructions."
},
{
"title": "More on the way",
"image": "coming-soon",
"meta": "50% faster burns, simultaneous writing for multiple drives. </br><a target='_blank' href='https://github.com/resin-io/etcher/milestones'>View our roadmap</a>"
"meta": "50% faster burns, simultaneous writing for multiple drives.<br/><a target='_blank' href='https://github.com/resin-io/etcher/milestones'>View our roadmap</a>"
}
],
"story": [
"Here at <a target='_blank' href='https://resin.io'>resin.io</a> we have thousands of users working through our getting started process and until recently we were embarassed about the steps that involved burning an SD card. There was a separate track for each Mac/Windows/Ubuntu and several manual and error prone steps along the way.",
"Here at <a target='_blank' href='https://resin.io'>resin.io</a> we have thousands of users working through our getting started process and until recently we were embarassed about the steps that involved burning an SD card. There was a separate track for each Mac/Windows/Linux and several manual and error-prone steps along the way.",
"To our surprise there was nothing out there that fitted our needs. So we built Etcher, a SD card burner app that is simple for end users, extensible for developers, and works on any platform. "
],
"cli": "### macOS and GNU/Linux\n\n- Extract the `.tar.gz` package by running:\n\n```sh\ntar fvx path/to/cli.tar.gz\n```\n\n- Move the resulting directory to `/opt/etcher-cli`\n\n- Add `/opt/etcher-cli` to the `PATH`. For example, add the following to\n `.bashrc` or `.zshrc`:\n\n```sh\nexport PATH=\"$PATH:/opt/etcher-cli\"\n```\n\n### Windows\n\n- Unzip the `.zip` package by right-clicking on it and selecting \"Extract All\"\n\n- Move the resulting directory to `C:\\etcher-cli`\n\n- Add `C:\\etcher-cli` to the `%PATH%`\n\n - On Windows 10 and Windows 8\n - Open *Control Panel*\n - Open *System\n - Click the *Advanced system settings* link\n - Click *Environment Variables*\n - Find the `PATH` environment variable, and click *Edit*\n - Append `;C:\\etcher-cli` to the environment variable value\n - Click *OK*\n\n - On Windows 7\n - Right-click the *My Computer* icon\n - Open the *Properties* menu\n - Open the *Advanced* tab\n - Click *Environment Variables*\n - Find the `PATH` environment variable, and click *Edit*\n - Append `;C:\\etcher-cli` to the environment variable value\n - Click *OK*\n\n - Re-open `cmd.exe`, or PowerShell\n\n### Running\n\n```sh\netcher -v\n```\n\n### Options\n\n```\n --help, -h show help\n --version, -v show version number\n --drive, -d drive\n --check, -c validate write\n --yes, -y confirm non-interactively\n --unmount, -u unmount on success\n```\n",
Expand Down
4 changes: 2 additions & 2 deletions lib/fetchData.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ const fetchData = () => {
.then(data => {
const sortedDownloads = _.orderBy(data[2].links, ['os', 'arch'], ['desc', 'asc']);
Object.assign(locals, {
cli: new Buffer(data[0].content.toString(), 'base64').toString(),
changelog: new Buffer(data[1].content.toString(), 'base64').toString(),
cli: new Buffer(data[0].content, 'base64').toString(),
changelog: new Buffer(data[1].content, 'base64').toString(),
version: data[2].version,
downloads: sortedDownloads.filter((item) => {
return item.href.indexOf('cli') === -1;
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"react-twitter-widgets": "1.3.0",
"react-typekit": "1.0.8",
"reactstrap": "4.6.2",
"resin-event-log": "1.4.0",
"resin-event-log": "^1.6.0",
"sniffr": "^1.1.4"
},
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@ const runTest = function(url) {
}).start();
}

app.use('/', express.static(path.join(__dirname, '../build')));
app.use(compression());
app.use('/', express.static(path.join(__dirname, '../build')));

const server = app.listen(1337, function() {
console.log('Listening on port: ' + 1337);
Expand Down
38 changes: 26 additions & 12 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2365,6 +2365,12 @@ googleapis@^16.0.0:
google-auth-library "~0.10.0"
string-template "~1.0.0"

gosquared@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/gosquared/-/gosquared-3.1.0.tgz#3484f8f0640cf5860db3a73ba9fc0248525a604c"
dependencies:
request "^2.51.0"

got@^6.7.1:
version "6.7.1"
resolved "https://registry.yarnpkg.com/got/-/got-6.7.1.tgz#240cd05785a9a18e561dc1b44b41c763ef1e8db0"
Expand Down Expand Up @@ -4293,7 +4299,7 @@ repeating@^2.0.0:
dependencies:
is-finite "^1.0.0"

request@2, request@2.x, request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0:
request@2, request@2.x, request@^2.51.0, request@^2.72.0, request@^2.74.0, request@^2.79.0, request@^2.81.0:
version "2.81.0"
resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0"
dependencies:
Expand Down Expand Up @@ -4339,29 +4345,37 @@ require-uncached@^1.0.2:
caller-path "^0.1.0"
resolve-from "^1.0.0"

resin-event-log@1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/resin-event-log/-/resin-event-log-1.4.0.tgz#9c922c4970dba633e0dce0f7eb06126044c95a24"
resin-event-log@^1.6.0:
version "1.6.0"
resolved "https://registry.yarnpkg.com/resin-event-log/-/resin-event-log-1.6.0.tgz#5ca52f95985496605e462ff2436d150834f22564"
dependencies:
bluebird "^3.4.7"
lodash "^4.0.0"
resin-mixpanel-client "^2.1.0"
resin-universal-ga "^1.1.0"
resin-mixpanel-client "^2.2.0"
resin-universal-ga "^1.2.0"
resin-universal-gosquared "^0.2.0"

resin-mixpanel-client@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/resin-mixpanel-client/-/resin-mixpanel-client-2.1.0.tgz#6292ddfe1ee5a6609fb38918509aa65b0681cde8"
resin-mixpanel-client@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/resin-mixpanel-client/-/resin-mixpanel-client-2.2.0.tgz#cb05bff660140376c4918d60546d68e62f49f36b"
dependencies:
bluebird "^3.4.7"
resin-universal-mixpanel "^2.1.0"

resin-universal-ga@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/resin-universal-ga/-/resin-universal-ga-1.1.0.tgz#645f84dd3557b38835c3a37af68d941ecd5d9c6b"
resin-universal-ga@^1.2.0:
version "1.2.0"
resolved "https://registry.yarnpkg.com/resin-universal-ga/-/resin-universal-ga-1.2.0.tgz#9076db3b6ea32333065e0c8269cc41524fa3640f"
dependencies:
bluebird "^3.4.7"
universal-analytics "^0.4.8"

resin-universal-gosquared@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/resin-universal-gosquared/-/resin-universal-gosquared-0.2.0.tgz#e7086e5c8a867ad09365c052eba6d0016b90c80c"
dependencies:
bluebird "^3.4.7"
gosquared "3.1.0"

resin-universal-mixpanel@^2.1.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/resin-universal-mixpanel/-/resin-universal-mixpanel-2.1.0.tgz#1edb2d313ca794322cdd9882dd24b3e5909bb207"
Expand Down