Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/jsonwebtoken-9.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
eruizgar91 authored Feb 15, 2023
2 parents 34cadcf + 8ee800d commit fc03e3d
Show file tree
Hide file tree
Showing 59 changed files with 3,659 additions and 1,896 deletions.
1 change: 1 addition & 0 deletions .commitlintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{ "extends": ["@commitlint/config-conventional"] }
6 changes: 1 addition & 5 deletions .env.sample
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,10 @@ IPFS_PROJECT_ID="2DAQCd37vAOT7rMZ8J2J9LnbO8N"
IPFS_PROJECT_SECRET="cd6f32767707d6cd34d151b0049f444d"
ENABLE_PROVENANCE=true
ARTIFACTS_FOLDER=./artifacts
CIRCUITS_FOLDER=./circuits

ENABLE_COMPUTE=true
ARGO_HOST=http://localhost:2746/
ARGO_NAMESPACE=argo
ARGO_AUTH_TOKEN="Bearer eyJhbGciOiJSUzI1NiIsImtpZCI6IjZ1QThNV1VqQ1l1S2RRNXdSMlMxWnpqM1dWU0lhRTNZV0lObVJUeXZ6YTAifQ.eyJpc3MiOiJrdWJlcm5ldGVzL3NlcnZpY2VhY2NvdW50Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9uYW1lc3BhY2UiOiJudm0tZGlzYyIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VjcmV0Lm5hbWUiOiJhcmdvLXdvcmtmbG93LnNlcnZpY2UtYWNjb3VudC10b2tlbiIsImt1YmVybmV0ZXMuaW8vc2VydmljZWFjY291bnQvc2VydmljZS1hY2NvdW50Lm5hbWUiOiJhcmdvLXdvcmtmbG93Iiwia3ViZXJuZXRlcy5pby9zZXJ2aWNlYWNjb3VudC9zZXJ2aWNlLWFjY291bnQudWlkIjoiMmU5ZmJhYTgtNDE1ZS00MDg1LWFhNzktNWY2MTQ0ZmIwZDcwIiwic3ViIjoic3lzdGVtOnNlcnZpY2VhY2NvdW50Om52bS1kaXNjOmFyZ28td29ya2Zsb3cifQ.SLpDBbEgB0RjIH38xloZjB07N0UBVmswOg5-pQl_K3vqpb15XM5TpWlQpcli5qQKuGGcNttxaxWxDByZ2tjgLFDCDzKle1zDCKz7j0089ZE3mLkDO6hd4Ndb52X8suAWSNdWOCxX0zI3v_JGozEhgnBfxg_pk-aA0hJL7CBnxpPjMD6NuiboaRGwQD4d3Q1mbF6XGRpI_76w3zB8eO3GoIZ-Yrr-8U-5eAhuMuSyMDAX7nr7BF1ci2487q0gFaV2sIY2eVjbnrIxpQKqZ0dg86ZwgwffKeo4RXEYMvB4pJkyEgxhTWyhBbYw_fS-WC5qvXM6r0x_aVll8M0iGe-iWA"
MINIO_HOST=localhost
MINIO_PORT=9000
MINIO_ACCESS_KEY=AKIAIOSFODNN7EXAMPLE
MINIO_SECRET_KEY=`wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY

NO_GRAPH=true
6 changes: 2 additions & 4 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"extends": [
"nevermined"
],
"extends": ["nevermined"],
"rules": {
"@next/next/no-html-link-for-pages": "off"
}
}
}
9 changes: 7 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@ about: Create a report to help us improve
title: ''
labels: ''
assignees: ''

---

## Describe the bug

A clear and concise description of what the bug is.

## To Reproduce
## To Reproduce

Steps to reproduce the behavior:

1.
2.

## Expected behavior

A clear and concise description of what you expected to happen.

## Screenshots

If applicable, add screenshots to help explain your problem.

## Additional context

Add any other context about the problem here.
4 changes: 3 additions & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ about: Suggest a new feature for this project
title: ''
labels: ''
assignees: ''

---

## Is your feature request related to a problem? Please describe.

A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

## Describe the solution you'd like

A clear and concise description of what you want to happen.

## Additional context

Add any other context or screenshots about the feature request here.
12 changes: 10 additions & 2 deletions .github/ISSUE_TEMPLATE/feature_ticket.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,40 @@ about: Create a feature ticket with all that is needed to start to work in it
title: ''
labels: ''
assignees: ''

---

## Description

A brief description about the feature that we want to implement

## Where (optional)

In which screen we need to work with the feature

## Benefit

The definitions of the positive impact of this feature

## Acceptance criteria

All the requirements that needs to fulfill the feature to consider complete

## Points to consider (optional)

Dependencies, or everything that is needed to consider that contribute to complete the feature

## Sources (optional)

Dependencies, or everything that is needed to consider that contribute to complete the feature

## Blockers (optional)

If there are other tickets which need to be finished in order to complete the current one

## Effort

The effort that is needed to implement the feature, it will help to define the priority of the ticket, it could be `low`, `medium` or `high`

## Impact
The positive impact that will have the feature for the project, it also help to define priority of the ticket

The positive impact that will have the feature for the project, it also help to define priority of the ticket
3 changes: 2 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
version: 2
updates:
- package-ecosystem: 'npm'
target-branch: 'develop'
directory: '/'
schedule:
interval: 'weekly'
interval: 'weekly'
4 changes: 3 additions & 1 deletion .github/issue_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@ about: Suggest a new feature for this project
title: ''
labels: ''
assignees: ''

---

## Is your feature request related to a problem? Please describe.

A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

## Describe the solution you'd like

A clear and concise description of what you want to happen.

## Additional context

Add any other context or screenshots about the feature request here.
3 changes: 1 addition & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ Related to Issue #
- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [ ] Breaking change (fix or feature that would cause existing functionality to change)

## Checklist:

- [ ] Follows the code style of this project.
- [ ] Tests Cover Changes
- [ ] Documentation

10 changes: 5 additions & 5 deletions .github/workflows/release-github.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ name: GitHub Release
on:
push:
tags:
- "v*.*.*"
- 'v*.*.*'

jobs:
release:
name: "Tagged Release"
runs-on: "ubuntu-latest"
name: 'Tagged Release'
runs-on: 'ubuntu-latest'
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down Expand Up @@ -59,9 +59,9 @@ jobs:
branch: ${{ env.COMMIT_BRANCH }}

- name: Publish Github relase
uses: "marvinpinto/action-automatic-releases@latest"
uses: 'marvinpinto/action-automatic-releases@latest'
with:
repo_token: "${{ secrets.GITHUB_TOKEN }}"
repo_token: '${{ secrets.GITHUB_TOKEN }}'
prerelease: false
files: |
CHANGELOG.md
105 changes: 0 additions & 105 deletions .github/workflows/test.yml

This file was deleted.

51 changes: 51 additions & 0 deletions .github/workflows/testing-integration.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
name: Integration Tests

on: [push]

jobs:
build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
with:
node-version: '16.x'
- name: Install dependencies
run: |
yarn
- name: Compile and lint
run: |
yarn run build
yarn run lint
- name: Check code formatting
run: yarn format:check
- uses: nevermined-io/[email protected]
with:
token: ${{ secrets.API_TOKEN_GITHUB }}
opengsn: 'false'
estuary: 'true'
node: 'false'
- name: Check artifacts
run: |
nvm-tools copy-artifacts ./artifacts
ls -l artifacts
nvm-tools copy-circuits ./circuits
ls -l circuits
- name: Run tests
run: |
export PROVIDER_KEYFILE=accounts/provider.json
export RSA_PRIVKEY_FILE=accounts/rsa_priv_key.pem
export RSA_PUBKEY_FILE=accounts/rsa_pub_key.pem
export PROVIDER_BABYJUB_SECRET=${{ secrets.PROVIDER_BABYJUB_SECRET }}
export BUYER_BABYJUB_SECRET=${{ secrets.BUYER_BABYJUB_SECRET }}
export PROVIDER_BABYJUB_PUBLIC1=${{ secrets.PROVIDER_BABYJUB_PUBLIC1 }}
export PROVIDER_BABYJUB_PUBLIC2=${{ secrets.PROVIDER_BABYJUB_PUBLIC2 }}
export BUYER_BABYJUB_PUBLIC1=${{ secrets.BUYER_BABYJUB_PUBLIC1 }}
export BUYER_BABYJUB_PUBLIC2=${{ secrets.BUYER_BABYJUB_PUBLIC2 }}
export NO_GRAPH=true
export SEED_WORDS=${{ secrets.seedWords }}
export PROVIDER_PASSWORD=secret
yarn run setup:dev
# HDWalletProvider keeps jest from exiting
yarn run integration:cov -- --forceExit
Loading

0 comments on commit fc03e3d

Please sign in to comment.