Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Tamas Schalk committed Jul 13, 2019
2 parents 84f4539 + 7dd6c33 commit 99c48b7
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
language: node_js
node_js:
- "8"
cache: yarn
branches:
only:
- master
- develop
before_script:
- yarn
script:
- gulp prod
after_success:
- git reset -hard

1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ Seamless texture generator in Javascript
[![preview](https://img.shields.io/badge/preview-click_here-green.svg?style=flat-square)](https://texture-generator.com/generator/demo/)
[![npm](https://img.shields.io/npm/dt/seamless-texture-generator.svg?style=flat-square)](https://www.npmjs.com/package/seamless-texture-generator)
[![GitHub issues](https://img.shields.io/github/issues/schalkt/tgen.svg?style=flat-square)](https://github.com/schalkt/tgen/issues)
[![Build Status](https://travis-ci.org/schalkt/tgen.svg?branch=master)](https://travis-ci.org/schalkt/tgen)
[![npm](https://img.shields.io/npm/v/seamless-texture-generator.svg?style=flat-square)](https://www.npmjs.com/package/seamless-texture-generator)
[![jsDelivr](https://data.jsdelivr.com/v1/package/npm/seamless-texture-generator/badge)](https://www.jsdelivr.com/package/npm/seamless-texture-generator)

Expand Down
8 changes: 0 additions & 8 deletions gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const gulp = require('gulp');
const gzip = require('gulp-gzip');
const bump = require('gulp-bump');
const gulpif = require('gulp-if');
const uglify = require('gulp-uglify');
const replace = require('gulp-replace');
const concat = require('gulp-concat');
Expand All @@ -15,13 +14,6 @@ var DIST = "dist";
var SRC = "src";
var PROD = false;

var nanoOptions = {
safe: true,
discardComments: {
removeAll: true
}
};

var banner = ['/**',
' * <%= pkg.name %> - <%= pkg.description %>',
' * ',
Expand Down

0 comments on commit 99c48b7

Please sign in to comment.