Skip to content

Commit

Permalink
Merge pull request #1223 from iorveth/iznik
Browse files Browse the repository at this point in the history
Merge latest Iznik changes
  • Loading branch information
bedeho authored Sep 3, 2020
2 parents f7dd96f + c71d820 commit cccc002
Show file tree
Hide file tree
Showing 2,509 changed files with 264,673 additions and 18,771 deletions.
16 changes: 7 additions & 9 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
# In case prettier plugin or eslint with autofix is not enabled in IDE
# The fallback settings here should match with our prettierrc config
# so we get consistency!
root = true

[*]
indent_style=tab
indent_size=tab
tab_width=4
indent_style=space
indent_size=2
tab_width=2
end_of_line=lf
charset=utf-8
trim_trailing_whitespace=true
max_line_length=120
insert_final_newline=true

[*.yml]
indent_style=space
indent_size=2
tab_width=8
end_of_line=lf
5 changes: 5 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
module.exports = {
extends: [
'@joystream/eslint-config'
]
}
47 changes: 47 additions & 0 deletions .github/workflows/joystream-cli.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: joystream-cli
on: [pull_request, push]

jobs:
cli_build_ubuntu:
name: Ubuntu Checks
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/cli checks
- name: yarn pack test
run: |
yarn workspace @joystream/cli pack --filename cli-pack-test.tgz
tar zxvf ./cli/cli-pack-test.tgz -C cli
cd ./cli/package && yarn link
cli_build_osx:
name: MacOS Checks
runs-on: macos-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace @joystream/cli checks
- name: yarn pack test
run: |
yarn workspace @joystream/cli pack --filename cli-pack-test.tgz
tar zxvf ./cli/cli-pack-test.tgz -C cli
cd ./cli/package && yarn link
49 changes: 49 additions & 0 deletions .github/workflows/joystream-types.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: joystream-types
on: [pull_request, push]

jobs:
types_checks_ubuntu:
name: Ubuntu Checks
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/types checks
- name: npm pack test
run: |
cd types
npm pack | tail -1 | xargs tar xzf
cd package && npm install
node ./index.js
types_checks_osx:
name: MacOS Checks
runs-on: macos-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace @joystream/types checks
- name: npm pack test
run: |
cd types
npm pack | tail -1 | xargs tar xzf
cd package && npm install
node ./index.js
37 changes: 37 additions & 0 deletions .github/workflows/network-tests.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: network-tests
on: [pull_request, push]

jobs:
network_build_ubuntu:
name: Ubuntu Checks
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile
yarn workspace joystream-testing checks
network_build_osx:
name: MacOS Checks
runs-on: macos-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace joystream-testing checks
71 changes: 71 additions & 0 deletions .github/workflows/pioneer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
name: Pioneer
on: [pull_request, push]

jobs:
pioneer_build_ubuntu:
name: Ubuntu Build
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: build
run: |
yarn install --frozen-lockfile
yarn workspace pioneer build
pioneer_build_osx:
name: MacOS Build
runs-on: macos-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: build
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace pioneer build
pioneer_lint_ubuntu:
name: Ubuntu Linting
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: lint
run: |
yarn install --frozen-lockfile
yarn workspace pioneer lint
pioneer_lint_osx:
name: MacOS Linting
runs-on: macos-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: lint
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace pioneer lint
37 changes: 37 additions & 0 deletions .github/workflows/storage-node.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: storage-node
on: [pull_request, push]

jobs:
storage_node_build_ubuntu:
name: Ubuntu Checks
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile
yarn workspace storage-node checks
storage_node_build_osx:
name: MacOS Checks
runs-on: macos-latest
strategy:
matrix:
node-version: [12.x]
steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace storage-node checks
12 changes: 11 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ joystream_runtime.wasm

# Generated by yarn
yarn*
!yarn.lock

# JetBrains IDEs
.idea
Expand All @@ -21,4 +22,13 @@ yarn*
.*.sw*

# Visual Studio Code
.vscode
.vscode/

# Compiled WASM code
*.wasm

# Temporary files
.tmp/

# Istanbul report output
**.nyc_output/
3 changes: 3 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
module.exports = {
...require('@joystream/prettier-config'),
}
Loading

0 comments on commit cccc002

Please sign in to comment.