Commit 1edfd933 authored by Greg Wilson's avatar Greg Wilson
Browse files

Merge branch 'core' of github.com:swcarpentry/lesson-template into adding-contributor-covenant

parents 0aa41ed5 b489aa66

.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ README.html 
LAYOUT.html

FAQ.html

DESIGN.html

CONTRIBUTING.html

*~

*.pyc

_site

CONTRIBUTING.md

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ You also agree to abide by our 
[conduct]: CONDUCT.md

[lesson-template-issues]: https://github.com/swcarpentry/lesson-template/issues

[license]: LICENSE.md

[pro-git]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project

[pro-git-chapter]: http://git-scm.com/book/en/v2/GitHub-Contributing-to-a-Project

[swc-lessons]: http://software-carpentry.org/lessons.html

[swc-maintainers]: http://software-carpentry.org/lessons.html#maintainers

[swc-website]: http://software-carpentry.org

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ DST_RMD = $(patsubst %.Rmd,%.md,$(SRC_RMD)) 


# All Markdown files (hand-written and generated).

ALL_MD = $(wildcard *.md) $(DST_RMD)

EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md

EXCLUDE_MD = README.md LAYOUT.md FAQ.md DESIGN.md CONTRIBUTING.md

SRC_MD = $(filter-out $(EXCLUDE_MD),$(ALL_MD))

DST_HTML = $(patsubst %.md,%.html,$(SRC_MD))

tools/setup-labels

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ fi 
OWNER=$1

REPO=$2

GITHUB_URL=https://github.com/${OWNER}/${REPO}

LABELS=(bug defer discussion duplicate enhancement filed-by-newcomer getting-started help-wanted left-as-was suitable-for-newcomer work-in-progress)

COLORS=(FF0000 66FF00 0000FF 98FB98 E0115F FFFF00 808000 89CFF0 568203 FCE883 545AA7)

LABELS_TO_DELETE=(help%20wanted invalid question wontfix)

LABELS=(bug    build  defer  discussion documentation enhancement newcomer-friendly upstream work-in-progress)

COLORS=(FF0000 551033 66FF00 0000FF     D4318C        E0115F      FCE883            83F52C   545AA7)

LABELS_TO_DELETE=(duplicate filed-by-newcomer getting-started help%20wanted help-wanted invalid left-as-was suitable-for-newcomer question wontfix)



# Test if repository exists

curl -s --head ${GITHUB_URL} | head -n 1 | grep -q "HTTP/1.[01] [23].."