2
0
Эх сурвалжийг харах

Merge branch 'mavit-make' into dev-build-scripts

* mavit-make:
  update contributor badge
  added Peter Oliver to contributors list
  Run lint via parallel make.
Chris Simpkins 7 жил өмнө
parent
commit
9f9c34f36d
4 өөрчлөгдсөн 20 нэмэгдсэн , 8 устгасан
  1. 3 7
      .travis.yml
  2. 13 0
      Makefile
  3. 1 1
      README.md
  4. 3 0
      docs/CONTRIBUTORS.md

+ 3 - 7
.travis.yml

@@ -2,10 +2,8 @@ sudo: true
 language: python
 
 env:
-  - VARIANT=source/Hack-Regular.ufo
-  - VARIANT=source/Hack-Bold.ufo
-  - VARIANT=source/Hack-Italic.ufo
-  - VARIANT=source/Hack-BoldItalic.ufo
+  - TARGET="lint"
+  - TARGET="build-with-dependencies"
 
 before_script: 
   - pip install ufolint
@@ -14,9 +12,7 @@ before_script:
   - sudo apt-get install -y gcc g++ libfreetype6-dev libglib2.0-dev libcairo2-dev
 
 script: 
-  - "ufolint $VARIANT"
-  - shellcheck build.sh
-  - ./build.sh --install-dependencies
+  - make -j $TARGET
 
 notifications:
   email: false

+ 13 - 0
Makefile

@@ -0,0 +1,13 @@
+build: source/*.ufo
+	./build.sh
+
+build-with-dependencies: source/*.ufo
+	./build.sh --install-dependencies
+
+lint: shellcheck ufolint
+
+shellcheck: build.sh
+	$@ $^
+
+ufolint: source/*.ufo
+	$@ $^

+ 1 - 1
README.md

@@ -1,7 +1,7 @@
 
 # Hack
 
-[![Build Status](https://travis-ci.org/source-foundry/Hack.svg?branch=master)](https://travis-ci.org/source-foundry/Hack) [![Contributors](https://img.shields.io/badge/contributors-104-orange.svg?style=flat)](https://github.com/chrissimpkins/Hack/blob/master/docs/CONTRIBUTORS.md)
+[![Build Status](https://travis-ci.org/source-foundry/Hack.svg?branch=master)](https://travis-ci.org/source-foundry/Hack) [![Contributors](https://img.shields.io/badge/contributors-105-orange.svg?style=flat)](https://github.com/chrissimpkins/Hack/blob/master/docs/CONTRIBUTORS.md)
 
 ### A typeface designed for source code
 

+ 3 - 0
docs/CONTRIBUTORS.md

@@ -64,6 +64,9 @@
 - @rahilwazir - Linux
 - Jakub Žitný - NPM
 
+### CI Testing
+- Peter Oliver
+
 
 ### DejaVu