Skip to content

Commit

Permalink
Merge pull request #551 from nevermined-io/develop
Browse files Browse the repository at this point in the history
SDK v2 PR - DRAFT
  • Loading branch information
aaitor authored Oct 20, 2023
2 parents a187c57 + d77f416 commit 12ba3fc
Show file tree
Hide file tree
Showing 535 changed files with 90,502 additions and 79,978 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
# Build process
- uses: actions/setup-node@v3
with:
node-version: '16.x'
node-version: 18

- name: Set version to env
run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-npm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16'
node-version: 18
registry-url: https://registry.npmjs.org/
- run: yarn install --frozen-lockfile --ignore-engines
- run: npm publish --access public
Expand Down
35 changes: 19 additions & 16 deletions .github/workflows/testing-nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install dependencies
run: |
Expand Down Expand Up @@ -46,7 +46,7 @@ jobs:
env:
ETH_PORT: 18545
run: |
yarn run test:cover
yarn test:all
subgraph-integration:
runs-on: ubuntu-latest
Expand All @@ -55,15 +55,16 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: nevermined-io/nvm-tools-actions@v0.12.0
node-version: 18
- uses: nevermined-io/nvm-tools-actions@v0.15.0
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
opengsn: 'true'
estuary: 'true'
compute: 'true'
contracts-version: 'v3.2.1'
node-version: 'v1.2.16'
# TODO: Update to tagged versions when everything is relased and in main branches
contracts-version: 'latest'
node-version: 'develop'

- name: Install dependencies
run: |
Expand Down Expand Up @@ -96,15 +97,16 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: nevermined-io/nvm-tools-actions@v0.11.0
node-version: 18
- uses: nevermined-io/nvm-tools-actions@v0.15.0
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
opengsn: 'true'
estuary: 'true'
compute: 'true'
contracts-version: 'v3.2.1'
node-version: 'v1.2.9'
# TODO: Update to tagged versions when everything is relased and in main branches
contracts-version: 'latest'
node-version: 'develop'

- name: Install dependencies
run: |
Expand All @@ -129,15 +131,16 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: nevermined-io/nvm-tools-actions@v0.11.0
node-version: 18
- uses: nevermined-io/nvm-tools-actions@v0.15.0
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
opengsn: 'true'
estuary: 'true'
compute: 'true'
contracts-version: 'v3.2.1'
node-version: 'v1.2.9'
# TODO: Update to tagged versions when everything is relased and in main branches
contracts-version: 'latest'
node-version: 'develop'

- name: Install dependencies
run: |
Expand All @@ -156,15 +159,15 @@ jobs:
IPFS_PROJECT_ID: ${{ secrets.IPFS_PROJECT_ID }}
IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
LOG_LEVEL: 1 # If LOG_LEVEL is >1 it will print the logger.debug calls
run: yarn run integration:cover
run: yarn integration:all

mumbai-integration:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Install dependencies
run: |
Expand Down
33 changes: 8 additions & 25 deletions .github/workflows/testing-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,48 +12,31 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18
- uses: actions/checkout@v3
with:
repository: nevermined-io/node
path: node
# TODO: remove this when Node integrated with SDKv2 is integraged
ref: develop
token: ${{ secrets.API_TOKEN_GITHUB }}
- uses: actions/checkout@v3
with:
repository: nevermined-io/sdk-dtp
path: sdk-dtp
token: ${{ secrets.API_TOKEN_GITHUB }}
- uses: nevermined-io/[email protected]
- uses: nevermined-io/[email protected]
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
opengsn: 'true'
estuary: 'true'
contracts-version: 'v3.2.1'
contracts-version: 'latest'
node: 'false'

- name: Install sponge
run: sudo apt-get install -y moreutils

- name: Install dependencies
run: yarn

- name: Build SDK-JS package and node
run: |
yarn build
yarn pack
cp *.tgz sdk-dtp/sdk.tgz
cp *.tgz node/sdk.tgz
cd sdk-dtp
cat package.json | jq '.dependencies."@nevermined-io/sdk"="./sdk.tgz"' | sponge package.json
yarn
yarn build
yarn pack
cp *dtp*.tgz ../node/dtp.tgz
cd ../node
cat package.json | jq '.dependencies."@nevermined-io/sdk"="./sdk.tgz"' | sponge package.json
cat package.json | jq '.dependencies."@nevermined-io/sdk-dtp"="./dtp.tgz"' | sponge package.json
yarn
cd node/
yarn add ../
yarn run setup:dev
yarn build
Expand All @@ -78,7 +61,7 @@ jobs:
NEVERMINED_NODE_URI: http://localhost:8030
run: |
nvm-tools copy-artifacts ./artifacts
yarn run integration:cover
yarn integration:all
- name: Upload node logs
uses: actions/upload-artifact@v2
Expand Down
23 changes: 14 additions & 9 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,15 @@ jobs:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: 16
- uses: nevermined-io/nvm-tools-actions@v0.12.0
node-version: 18
- uses: nevermined-io/nvm-tools-actions@v0.15.0
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
opengsn: 'true'
estuary: 'true'
contracts-version: 'v3.2.1'
# TODO: Update to tagged versions when everything is released and in main branches
node-version: 'develop'
contracts-version: 'latest'

- name: Install dependencies
run: |
Expand All @@ -40,12 +42,14 @@ jobs:
IPFS_PROJECT_ID: ${{ secrets.IPFS_PROJECT_ID }}
IPFS_PROJECT_SECRET: ${{ secrets.IPFS_PROJECT_SECRET }}
LOG_LEVEL: 1 # If LOG_LEVEL is >1 it will print the logger.debug calls
run: yarn run integration:cover
run: yarn integration:all

unit-tests:
runs-on: ubuntu-latest

steps:
- name: Reclaim some disk space
run: docker system prune --all --volumes -f
- uses: actions/checkout@v3
- uses: actions/checkout@v3
with:
Expand All @@ -55,7 +59,7 @@ jobs:
token: ${{ secrets.API_TOKEN_GITHUB }}
- uses: actions/setup-node@v3
with:
node-version: 16
node-version: 18

- name: Deploy contracts
run: |
Expand All @@ -73,14 +77,15 @@ jobs:
- name: Install dependencies
run: |
yarn
- name: Run linters
run: yarn lint
- name: Start ganache
run: yarn ganache --port 18545 --chain.chainId 8998 &
env:
SEED_WORDS: ${{ secrets.seedWords }}
run: yarn ganache --server.port 18545 --chain.chainId 8998 --wallet.mnemonic "$SEED_WORDS" --detach

- name: Run unit tests
env:
ETH_PORT: 18545
SEED_WORDS: ${{ secrets.seedWords }}
run: |
yarn run test:cover
yarn test:all
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ coverage/
doc/
test/**/*.js
!test/resources/proxy-poc/*.js
!test/resources/artifacts/*.json
src/**/*.js
package-lock.json
yarn.lock
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v12
18
Loading

0 comments on commit 12ba3fc

Please sign in to comment.