Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
wwwanlingxiao
public-apis
Commits
ff376008
Commit
ff376008
authored
Oct 26, 2017
by
Dave Machado
Committed by
GitHub
Oct 26, 2017
Browse files
Merge pull request #530 from toddmotto/check-json-build
Add check to see if /json was changed
parents
d7dec9cd
b76486d6
Changes
2
Hide whitespace changes
Inline
Side-by-side
build/main.sh
View file @
ff376008
...
@@ -2,42 +2,53 @@
...
@@ -2,42 +2,53 @@
FORMAT_FILE
=
../README.md
FORMAT_FILE
=
../README.md
if
[
"
$TRAVIS_PULL_REQUEST
"
==
"false"
]
;
then
if
[
"
$TRAVIS_PULL_REQUEST
"
==
"false"
]
;
then
echo
"running on
$TRAVIS_BRANCH
branch"
echo
"running on
$TRAVIS_BRANCH
branch"
LINK_FILE
=
../README.md
LINK_FILE
=
../README.md
else
else
echo
"running on Pull Request #
$TRAVIS_PULL_REQUEST
"
echo
"running on Pull Request #
$TRAVIS_PULL_REQUEST
"
DIFF_URL
=
"https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/
$TRAVIS_PULL_REQUEST
.diff"
DIFF_URL
=
"https://patch-diff.githubusercontent.com/raw/toddmotto/public-apis/pull/
$TRAVIS_PULL_REQUEST
.diff"
curl
$DIFF_URL
>
diff.txt
curl
$DIFF_URL
>
diff.txt
echo
"------- BEGIN DIFF -------"
echo
"------- BEGIN DIFF -------"
cat
diff.txt
cat
diff.txt
echo
"-------- END DIFF --------"
echo
"-------- END DIFF --------"
cat
diff.txt | egrep
"
\+
"
>
additions.txt
cat
diff.txt | egrep
"
\+
"
>
additions.txt
echo
"------ BEGIN ADDITIONS -----"
echo
"------ BEGIN ADDITIONS -----"
cat
additions.txt
cat
additions.txt
echo
"------- END ADDITIONS ------"
echo
"------- END ADDITIONS ------"
LINK_FILE
=
additions.txt
LINK_FILE
=
additions.txt
echo
"checking if /json was changed..."
if
egrep
"
\+
{3}
\s
.
\/
json
\/
"
diff.txt
>
json.txt
;
then
echo
"JSON files are auto-generated! Please do not update these files:"
cat
json.txt
exit
1
else
echo
"/json check passed!"
rm
json.txt
fi
fi
fi
echo
"running format validation..."
echo
"running format validation..."
./validate_format.rb
$FORMAT_FILE
./validate_format.rb
$FORMAT_FILE
if
[[
$?
!=
0
]]
;
then
if
[[
$?
!=
0
]]
;
then
echo
"format validation failed!"
echo
"format validation failed!"
exit
1
exit
1
else
else
echo
"format validation passed!"
echo
"format validation passed!"
./build.sh
&&
./deploy.sh
./build.sh
&&
./deploy.sh
if
[[
$?
!=
0
]]
;
then
if
[[
$?
!=
0
]]
;
then
echo
"JSON build and deploy failed!"
echo
"JSON build and deploy failed!"
else
else
echo
"JSON build and deploy success!"
echo
"JSON build and deploy success!"
fi
fi
fi
fi
echo
"running link validation..."
echo
"running link validation..."
./validate_links.rb
$LINK_FILE
./validate_links.rb
$LINK_FILE
if
[[
$?
!=
0
]]
;
then
if
[[
$?
!=
0
]]
;
then
echo
"link validation failed!"
echo
"link validation failed!"
exit
1
exit
1
else
else
echo
"link validation passed!"
echo
"link validation passed!"
fi
fi
json/entries.json
View file @
ff376008
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"count"
:
465
,
"count"
:
465
,
"entries"
:
[
"entries"
:
[
{
{
"API"
:
"Dogs"
,
"API"
:
"Dogs
are the best
"
,
"Auth"
:
null
,
"Auth"
:
null
,
"Category"
:
"Animals"
,
"Category"
:
"Animals"
,
"Description"
:
"Based on the Stanford Dogs Dataset"
,
"Description"
:
"Based on the Stanford Dogs Dataset"
,
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment