Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apps metaprotocol update from master #4669

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
d71bb6f
graphql typegen
mnaamani Feb 14, 2023
5ececd8
revert generate:all ran without building packages first
mnaamani Feb 16, 2023
576be61
Remove autogenerated files
Lezek123 Feb 16, 2023
6146cae
Merge remote-tracking branch 'upstream/master' into remove-autogenera…
Lezek123 Feb 16, 2023
b95e58d
Argus: Fix typegen order
Lezek123 Feb 16, 2023
1b1edfd
Add `network-tests` to `build-packages.sh`
Lezek123 Feb 16, 2023
9700d3d
Fix distributor node docker build
Lezek123 Feb 16, 2023
0a8eece
Adjust workflows
Lezek123 Feb 16, 2023
105a4da
Adjust workflows: part 2
Lezek123 Feb 16, 2023
dbac101
Fix storage node build
Lezek123 Feb 16, 2023
1c72261
Merge remote-tracking branch 'upstream/master' into remove-autogenera…
Lezek123 Feb 16, 2023
1c7d959
Merge pull request #4636 from mnaamani/master-typegen
mnaamani Feb 17, 2023
dbdec2d
Merge pull request #4642 from Lezek123/storage-sync-timeout
mnaamani Feb 20, 2023
38fa3ec
Merge remote-tracking branch 'upstream/master' into remove-autogenera…
Lezek123 Feb 22, 2023
2f3d09f
Merge pull request #4640 from Lezek123/remove-autogenerated-files
Lezek123 Feb 22, 2023
4dd407b
update yarn.lock
mnaamani Feb 23, 2023
cb9d7a8
Network tests: Fix memory leak, increase storageSync wait time
Lezek123 Feb 23, 2023
7798c89
Fix typo
Lezek123 Feb 23, 2023
58b07e8
Merge pull request #4658 from mnaamani/yarn-lock-update
Lezek123 Feb 24, 2023
b3be3e2
Merge pull request #4659 from Lezek123/tests-memory-leak
mnaamani Feb 24, 2023
e8ba60b
deploy playgrounds in eu-central-1 with t2.xlarge instance type
mnaamani Feb 27, 2023
7f9fef6
Merge pull request #4668 from mnaamani/master-playground-update
Lezek123 Feb 27, 2023
3bf9d68
Merge branch 'master' into apps-metaprotocol-update-from-master
Lezek123 Feb 27, 2023
2f0ea74
playgrounds: choose correct ami for region
mnaamani Feb 27, 2023
d17f0f9
Merge pull request #4670 from mnaamani/master-playground-update
Lezek123 Feb 27, 2023
ad25d72
Merge remote-tracking branch 'upstream/master' into apps-metaprotocol…
Lezek123 Feb 27, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ query-node/lib
tests/
!tests/network-tests/proposal-parameters.json
devops/
!devops/eslint-config
!devops/prettier-config
6 changes: 4 additions & 2 deletions .github/workflows/deploy-playground.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,8 @@ jobs:
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: us-east-1
# When changing region double check ami image is available in deploy step
aws-region: eu-central-1

- name: Check if CloudFormation stack exists
id: stack_exists
Expand All @@ -86,7 +87,8 @@ jobs:
name: ${{ env.STACK_NAME }}
template: devops/aws/cloudformation/single-instance.yml
no-fail-on-empty-changeset: '1'
parameter-overrides: 'KeyName=joystream-github-action-key-new,EC2InstanceType=t2.large'
# Make sure ami image is available in the region specified in configure aws creds step
parameter-overrides: 'KeyName=joystream-github-action-key-new,EC2InstanceType=t2.xlarge,EC2AMI=ami-06b4d9ba1f23a8da4'

- name: Run playbook
uses: dawidd6/action-ansible-playbook@v2
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/joystream-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace query-node-root build
- name: yarn pack test
run: |
yarn workspace @joystream/cli pack --filename cli-pack-test.tgz
Expand All @@ -42,6 +43,7 @@ jobs:
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace query-node-root build
- name: yarn pack test
run: |
yarn workspace @joystream/cli pack --filename cli-pack-test.tgz
Expand Down
8 changes: 2 additions & 6 deletions .github/workflows/lint-typescript.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: lint
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn build:packages
yarn lint

lint_osx:
Expand All @@ -35,7 +33,5 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: lint
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn build:packages
yarn lint
22 changes: 4 additions & 18 deletions .github/workflows/run-network-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace @joystream/cli build
yarn workspace network-tests build
yarn build:packages

tests_build_osx:
name: MacOS Checks
Expand All @@ -41,11 +37,7 @@ jobs:
node-version: ${{ matrix.node-version }}
- name: checks
run: |
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace @joystream/cli build
yarn workspace network-tests build
yarn build:packages

build_images:
name: Build joystream/node
Expand Down Expand Up @@ -172,10 +164,7 @@ jobs:
docker images
- name: Install packages and dependencies
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace @joystream/cli build
yarn build:packages
- name: Ensure tests are runnable
run: yarn workspace network-tests build
- name: Execute network tests
Expand Down Expand Up @@ -205,10 +194,7 @@ jobs:
docker images
- name: Install packages and dependencies
run: |
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace @joystream/cli build
yarn build:packages
- name: Ensure tests are runnable
run: yarn workspace network-tests build
- name: Execute network tests
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/storage-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ jobs:
yarn install --frozen-lockfile
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace query-node-root build
yarn workspace storage-node build

storage_node_build_osx:
Expand All @@ -38,4 +39,5 @@ jobs:
yarn install --frozen-lockfile --network-timeout 120000
yarn workspace @joystream/types build
yarn workspace @joystream/metadata-protobuf build
yarn workspace query-node-root build
yarn workspace storage-node build
1 change: 1 addition & 0 deletions build-packages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ yarn workspace query-node-root build
yarn workspace @joystream/cli build
yarn workspace storage-node build
yarn workspace @joystream/distributor-cli build
yarn workspace network-tests build
3 changes: 3 additions & 0 deletions cli/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@
/yarn.lock
node_modules
/examples/content/*__rejectedContent.json
# Autogenerated files
/src/schemas/typings
**/generated/*
4 changes: 2 additions & 2 deletions cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,9 @@
"scripts": {
"postpack": "rm -f oclif.manifest.json",
"posttest": "yarn lint",
"prepack": "rm -rf lib && tsc -b && oclif-dev manifest && oclif-dev readme",
"prepack": "yarn build && oclif-dev manifest && oclif-dev readme",
"test": "nyc --extension .ts mocha --forbid-only \"test/**/*.test.ts\"",
"build": "rm -rf lib && tsc --build tsconfig.json",
"build": "rm -rf lib && yarn generate:all && tsc --build tsconfig.json",
"version": "oclif-dev readme && git add README.md",
"lint": "eslint ./src --ext .ts",
"checks": "tsc --noEmit --pretty && prettier ./ --check && yarn lint",
Expand Down
Loading