Skip to content

Commit

Permalink
chore: merge beta branch into master (#1130)
Browse files Browse the repository at this point in the history
Co-authored-by: Hugo Dias <mail@hugodias.me>
Co-authored-by: Henri <3359083+sternhenri@users.noreply.github.com>
Co-authored-by: Henri S <sternhenri@users.noreply.github.com>
Co-authored-by: nikkolasg <nikkolasg@gmail.com>
Co-authored-by: Oli Evans <oli@tableflip.io>
Co-authored-by: Lucas Molas <schomatis@gmail.com>
Co-authored-by: Alex North <445306+anorth@users.noreply.github.com>
Co-authored-by: dirkmc <dirkmdev@gmail.com>
Co-authored-by: Hannah Howard <hannah@hannahhoward.net>
Co-authored-by: Hugo Dias <hugomrdias@gmail.com>
Co-authored-by: Yiannis Psaras <52073247+yiannisbot@users.noreply.github.com>
Co-authored-by: Volker Mische <volker.mische@gmail.com>
Co-authored-by: Nicola <1424850+nicola@users.noreply.github.com>
Co-authored-by: DrPeterVanNostrand <jnz@riseup.net>
Co-authored-by: Mike Greenberg <mg+github@protocol.ai>
  • Loading branch information
15 people authored Aug 31, 2020
2 parents 0a17da1 + e9ddf27 commit c24b21d
Show file tree
Hide file tree
Showing 713 changed files with 11,780 additions and 82,322 deletions.
39 changes: 0 additions & 39 deletions .circleci/config.yml

This file was deleted.

49 changes: 0 additions & 49 deletions .github/workflows/add-to-ipfs.yml

This file was deleted.

70 changes: 0 additions & 70 deletions .github/workflows/deploy-to-gh-pages.yml

This file was deleted.

48 changes: 48 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: CI

on: [push]

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- uses: actions/setup-go@v2
with:
go-version: '1.14'

- uses: actions/setup-node@v2-beta
with:
node-version: '12'

# get lotus deps...
- run: sudo apt install bzr

- run: npm install
- run: npm test
- run: npm run build

# Pin the built site to ipfs-cluster, output the cid as `steps.ipfs.outputs.cid`
# see: https://github.com/ipfs-shipyard/ipfs-github-action
- uses: ipfs-shipyard/ipfs-github-action@v2.0.0
id: ipfs
with:
path_to_add: public
cluster_host: /dnsaddr/cluster.ipfs.io
cluster_user: ${{ secrets.CLUSTER_USER }}
cluster_password: ${{ secrets.CLUSTER_PASSWORD }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- run: echo /ipfs/${{ steps.ipfs.outputs.cid }}

- run: echo ${{ github.ref }}

# Update the dnslink if changes to the current branch should go live
# see https://github.com/ipfs-shipyard/js-dnslink-dnsimple
- run: npx dnslink-dnsimple --domain spec.filecoin.io --link /ipfs/${{ steps.ipfs.outputs.cid }}
env:
DNSIMPLE_TOKEN: ${{ secrets.DNSIMPLE_TOKEN }}
# TODO: change to master once merged.
if: github.ref == 'refs/heads/master'
15 changes: 4 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
.vscode
.idea
public/
deps/
.slime/
build/
hugo/resources
hugo/content/docs
hugo/content/ox-hugo
hugo/content/codeGen/main
.DS_Store
*.gen.go
hugo/data/version.yml
pkg/
tools/codeGen/codeGen
yarn.lock
node_modules
resources
static/_gen
9 changes: 0 additions & 9 deletions .gitmodules

This file was deleted.

15 changes: 15 additions & 0 deletions .remarkrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
plugins:
# make remark aware of fontmatter.
remark-frontmatter:
# sensible linter defaults see: https://github.com/remarkjs/remark-lint/tree/main/packages/remark-preset-lint-recommended#rules
remark-preset-lint-recommended:
# add extra rules
remark-lint-heading-increment:
remark-lint-fenced-code-flag:
remark-lint-first-heading-level:
remark-lint-no-hr-after-heading:
# disable some of the sensible defaults given where we are today.
remark-lint-list-item-indent: false
remark-lint-final-newline: false
remark-lint-no-literal-urls: false
remark-lint-list-item-bullet-indent: false
Loading

0 comments on commit c24b21d

Please sign in to comment.