Skip to content

Commit 2835ca0

Browse files
Merge pull request #732 from LaurentGoderre/fix-update
Fix the update script and .travis.yml.template
2 parents 42eae25 + 1cf5b83 commit 2835ca0

File tree

2 files changed

+20
-1
lines changed

2 files changed

+20
-1
lines changed

travis.yml.template

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,17 @@ stages:
2020

2121
jobs:
2222
include:
23+
- stage: Test
24+
env:
25+
- TEST: Editor Config check
26+
language: node_js
27+
node_js:
28+
- lts/*
29+
install:
30+
- npm i -g eclint
31+
script:
32+
- eclint check
33+
2334
- stage: Test
2435
env:
2536
- TEST: Doc Toc Check
@@ -30,6 +41,14 @@ jobs:
3041
doctoc --title='## Table of Contents' --github README.md &&
3142
diff -q README.md README.md.tmp
3243

44+
- stage: Test
45+
env:
46+
- TEST: shfmt check
47+
script:
48+
- docker run -it --rm -v "$(pwd)":/sh -w /sh jamesmstone/shfmt -i 2 -l -w -ci .
49+
- git diff --color
50+
- git diff --stat=220 --color --exit-code
51+
3352
- stage: Test
3453
env:
3554
- TEST: Shell Check

update.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function update_node_version() {
3737
fullVersion="$(curl -sSL --compressed "$baseuri" | grep '<a href="v'"$version." | sed -E 's!.*<a href="v([^"/]+)/?".*!\1!' | cut -d'.' -f2,3 | sort -n | tail -1)"
3838
(
3939
cp "$template" "$dockerfile"
40-
local fromprefix
40+
local fromprefix=""
4141
if [[ "$arch" != "amd64" && "$variant" != "onbuild" ]]; then
4242
fromprefix="$arch\\/"
4343
fi

0 commit comments

Comments
 (0)