Skip to content

Commit

Permalink
Merge pull request #2 from ethereum/master
Browse files Browse the repository at this point in the history
get up to date
  • Loading branch information
gcolvin authored Feb 23, 2019
2 parents 8bd5166 + 13104c6 commit 5c77e0a
Show file tree
Hide file tree
Showing 237 changed files with 28,961 additions and 2,652 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# GitHub highlighting for Solidity files
# See https://github.com/github/linguist/pull/3973#issuecomment-357507741
*.sol linguist-language=Solidity
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
_site
.sass-cache
.jekyll-metadata
27 changes: 27 additions & 0 deletions .travis-ci.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
#!/bin/bash
set -e # halt script on error

HTMLPROOFER_OPTIONS="./_site --internal-domains=eips.ethereum.org --check-html --check-opengraph --report-missing-names --log-level=:debug --assume-extension --empty-alt-ignore --timeframe=6w --url-ignore=/EIPS/eip-1,EIPS/eip-1,/EIPS/eip-107,/EIPS/eip-858"

if [[ $TASK = 'htmlproofer' ]]; then
bundle exec jekyll doctor
bundle exec jekyll build
bundle exec htmlproofer $HTMLPROOFER_OPTIONS --disable-external

# Validate GH Pages DNS setup
bundle exec github-pages health-check
elif [[ $TASK = 'htmlproofer-external' ]]; then
bundle exec jekyll doctor
bundle exec jekyll build
bundle exec htmlproofer $HTMLPROOFER_OPTIONS --external_only
elif [[ $TASK = 'eip-validator' ]]; then
BAD_FILES="$(ls EIPS | egrep -v "eip-[0-9]+.md|eip-20-token-standard.md")" || true
if [[ ! -z $BAD_FILES ]]; then
echo "Files found with invalid names:"
echo $BAD_FILES
exit 1
fi

FILES="$(ls EIPS/*.md | egrep "eip-[0-9]+.md")"
bundle exec eip_validator $FILES
fi
45 changes: 45 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
sudo: false # route your build to the container-based infrastructure for a faster build

language: ruby

before_install:
- gem install bundler -v '< 2'

cache:
# Cache Ruby bundles
- bundler
- directories:
- $TRAVIS_BUILD_DIR/tmp/.htmlproofer #https://github.com/gjtorikian/html-proofer/issues/381


# Assume bundler is being used, therefore
# the `install` step will run `bundle install` by default.
script: "bash -ex .travis-ci.sh"

env:
global:
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true # speeds up installation of html-proofer

matrix:
fast_finish: true
include:
- rvm: 2.2.5
env: TASK='htmlproofer'
- rvm: 2.2.5
env: TASK='htmlproofer-external'
- rvm: 2.2.5
env: TASK='eip-validator'
allow_failures:
- rvm: 2.2.5
env: TASK='htmlproofer-external'

notifications:
webhooks:
urls:
- https://ethlab-183014.appspot.com/merge/
on_success: always

addons:
apt:
packages:
"libcurl4-openssl-dev" # https://github.com/gjtorikian/html-proofer/issues/376#issuecomment-332767999
24 changes: 24 additions & 0 deletions 404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
---
layout: default
---

<style type="text/css" media="screen">
.container {
margin: 10px auto;
max-width: 600px;
text-align: center;
}
h1 {
margin: 30px 0;
font-size: 4em;
line-height: 1;
letter-spacing: -1px;
}
</style>

<div class="container">
<h1>404</h1>

<p><strong>Page not found :(</strong></p>
<p>The requested page could not be found.</p>
</div>
1 change: 1 addition & 0 deletions CNAME
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
eips.ethereum.org
271 changes: 271 additions & 0 deletions EIPS/eip-1.md

Large diffs are not rendered by default.

176 changes: 0 additions & 176 deletions EIPS/eip-1.mediawiki

This file was deleted.

Binary file removed EIPS/eip-1/process.png
Binary file not shown.
Loading

0 comments on commit 5c77e0a

Please sign in to comment.