From 3ff705b8d2c7bf3deae606b27c5bd38b735a0706 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Mon, 22 Jun 2020 15:23:29 +0300 Subject: [PATCH 1/4] github actions: add type and cli checks --- .github/workflows/joystream-cli.yml | 21 +++++++++++++++++++++ .github/workflows/types.yml | 20 ++++++++++++++++++++ 2 files changed, 41 insertions(+) create mode 100644 .github/workflows/joystream-cli.yml create mode 100644 .github/workflows/types.yml diff --git a/.github/workflows/joystream-cli.yml b/.github/workflows/joystream-cli.yml new file mode 100644 index 0000000000..625c4dde88 --- /dev/null +++ b/.github/workflows/joystream-cli.yml @@ -0,0 +1,21 @@ +name: joystream-cli +on: [pull_request, push] + +jobs: + types_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 @joystream/types build + yarn workspace joystream-cli build \ No newline at end of file diff --git a/.github/workflows/types.yml b/.github/workflows/types.yml new file mode 100644 index 0000000000..1842b79b74 --- /dev/null +++ b/.github/workflows/types.yml @@ -0,0 +1,20 @@ +name: "@joystream/types" +on: [pull_request, push] + +jobs: + types_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 @joystream/types build \ No newline at end of file From 79a87d870abd426934548915c61e176f7d8ac1d8 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 24 Jun 2020 07:32:27 +0300 Subject: [PATCH 2/4] add osx to build checks for cli and types --- .github/workflows/joystream-cli.yml | 20 +++++++++++++++++++- .github/workflows/types.yml | 17 +++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/.github/workflows/joystream-cli.yml b/.github/workflows/joystream-cli.yml index 625c4dde88..d0c75272f1 100644 --- a/.github/workflows/joystream-cli.yml +++ b/.github/workflows/joystream-cli.yml @@ -2,7 +2,7 @@ name: joystream-cli on: [pull_request, push] jobs: - types_build_ubuntu: + cli_build_ubuntu: name: Ubuntu Build runs-on: ubuntu-latest strategy: @@ -10,6 +10,24 @@ jobs: 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 @joystream/types build + yarn workspace joystream-cli build + + cli_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: diff --git a/.github/workflows/types.yml b/.github/workflows/types.yml index 1842b79b74..509bf4e56a 100644 --- a/.github/workflows/types.yml +++ b/.github/workflows/types.yml @@ -10,6 +10,23 @@ jobs: 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 @joystream/types build + + types_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: From 2067c508a359a744958fa4a468cb1da86352dcf7 Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 24 Jun 2020 07:36:41 +0300 Subject: [PATCH 3/4] cli checks: increase TCP timeout for yarn install on OSX --- .github/workflows/joystream-cli.yml | 2 +- .github/workflows/pioneer-pr.yml | 4 ++-- .github/workflows/types.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/joystream-cli.yml b/.github/workflows/joystream-cli.yml index d0c75272f1..7a349b6c28 100644 --- a/.github/workflows/joystream-cli.yml +++ b/.github/workflows/joystream-cli.yml @@ -34,6 +34,6 @@ jobs: node-version: ${{ matrix.node-version }} - name: build run: | - yarn install --frozen-lockfile + yarn install --frozen-lockfile --network-timeout 120000 yarn workspace @joystream/types build yarn workspace joystream-cli build \ No newline at end of file diff --git a/.github/workflows/pioneer-pr.yml b/.github/workflows/pioneer-pr.yml index 60c4d9e842..bca36c79cf 100644 --- a/.github/workflows/pioneer-pr.yml +++ b/.github/workflows/pioneer-pr.yml @@ -33,7 +33,7 @@ jobs: node-version: ${{ matrix.node-version }} - name: build run: | - yarn install --frozen-lockfile + yarn install --frozen-lockfile --network-timeout 120000 yarn workspace pioneer build pioneer_lint_ubuntu: @@ -67,5 +67,5 @@ jobs: node-version: ${{ matrix.node-version }} - name: lint run: | - yarn install --frozen-lockfile + yarn install --frozen-lockfile --network-timeout 120000 yarn workspace pioneer lint diff --git a/.github/workflows/types.yml b/.github/workflows/types.yml index 509bf4e56a..7afc770cd1 100644 --- a/.github/workflows/types.yml +++ b/.github/workflows/types.yml @@ -33,5 +33,5 @@ jobs: node-version: ${{ matrix.node-version }} - name: build run: | - yarn install --frozen-lockfile + yarn install --frozen-lockfile --network-timeout 120000 yarn workspace @joystream/types build \ No newline at end of file From 8789e655384f681cf1c9e316183bf26c8ca1cf5b Mon Sep 17 00:00:00 2001 From: Mokhtar Naamani Date: Wed, 24 Jun 2020 15:31:35 +0300 Subject: [PATCH 4/4] cli jobs: drop job for types and add circular dep check in types library --- .github/workflows/joystream-cli.yml | 4 +- .../workflows/{pioneer-pr.yml => pioneer.yml} | 4 ++ .github/workflows/types.yml | 37 ------------------- 3 files changed, 6 insertions(+), 39 deletions(-) rename .github/workflows/{pioneer-pr.yml => pioneer.yml} (92%) delete mode 100644 .github/workflows/types.yml diff --git a/.github/workflows/joystream-cli.yml b/.github/workflows/joystream-cli.yml index 7a349b6c28..d24898770e 100644 --- a/.github/workflows/joystream-cli.yml +++ b/.github/workflows/joystream-cli.yml @@ -17,7 +17,7 @@ jobs: - name: build run: | yarn install --frozen-lockfile - yarn workspace @joystream/types build + yarn madge --circular types/ yarn workspace joystream-cli build cli_build_osx: @@ -35,5 +35,5 @@ jobs: - name: build run: | yarn install --frozen-lockfile --network-timeout 120000 - yarn workspace @joystream/types build + yarn madge --circular types/ yarn workspace joystream-cli build \ No newline at end of file diff --git a/.github/workflows/pioneer-pr.yml b/.github/workflows/pioneer.yml similarity index 92% rename from .github/workflows/pioneer-pr.yml rename to .github/workflows/pioneer.yml index bca36c79cf..e2272c86d4 100644 --- a/.github/workflows/pioneer-pr.yml +++ b/.github/workflows/pioneer.yml @@ -17,6 +17,7 @@ jobs: - name: build run: | yarn install --frozen-lockfile + yarn madge --circular types/ yarn workspace pioneer build pioneer_build_osx: @@ -34,6 +35,7 @@ jobs: - name: build run: | yarn install --frozen-lockfile --network-timeout 120000 + yarn madge --circular types/ yarn workspace pioneer build pioneer_lint_ubuntu: @@ -51,6 +53,7 @@ jobs: - name: lint run: | yarn install --frozen-lockfile + yarn madge --circular types/ yarn workspace pioneer lint pioneer_lint_osx: @@ -68,4 +71,5 @@ jobs: - name: lint run: | yarn install --frozen-lockfile --network-timeout 120000 + yarn madge --circular types/ yarn workspace pioneer lint diff --git a/.github/workflows/types.yml b/.github/workflows/types.yml deleted file mode 100644 index 7afc770cd1..0000000000 --- a/.github/workflows/types.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: "@joystream/types" -on: [pull_request, push] - -jobs: - types_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 @joystream/types build - - types_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 @joystream/types build \ No newline at end of file