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

chore: merge develop #597

Merged
19 commits merged into from
Mar 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 5 additions & 0 deletions .changeset/giant-bags-draw.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/masca": patch
---

Sets default network to mainnet.
6 changes: 6 additions & 0 deletions .changeset/gorgeous-cougars-marry.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@blockchain-lab-um/masca-types": patch
"@blockchain-lab-um/masca": patch
---

Add state migration & update tests
5 changes: 5 additions & 0 deletions .changeset/late-needles-press.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/extended-verification": patch
---

Adds public JSON RPC providers.
27 changes: 27 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"mode": "pre",
"tag": "beta",
"initialVersions": {
"@blockchain-lab-um/did-provider-ebsi": "1.2.1",
"@blockchain-lab-um/did-provider-key": "1.0.8-beta.0",
"@blockchain-lab-um/extended-verification": "0.1.0",
"@blockchain-lab-um/oidc-client-plugin": "0.3.0",
"@blockchain-lab-um/oidc-types": "0.0.8",
"@blockchain-lab-um/utils": "1.3.7",
"@blockchain-lab-um/masca-connector": "1.3.0",
"@blockchain-lab-um/dapp": "1.2.0",
"@blockchain-lab-um/veramo-datamanager": "1.0.1",
"@blockchain-lab-um/masca-docs": "1.1.1",
"@blockchain-lab-um/masca": "1.2.0",
"@blockchain-lab-um/masca-types": "1.3.0"
},
"changesets": [
"giant-bags-draw",
"gorgeous-cougars-marry",
"late-needles-press",
"shiny-meals-talk",
"strong-pens-thank",
"warm-jeans-sit",
"witty-apes-repair"
]
}
5 changes: 5 additions & 0 deletions .changeset/shiny-meals-talk.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/dapp": minor
---

Adds campaigns feature.
5 changes: 5 additions & 0 deletions .changeset/strong-pens-thank.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/dapp": patch
---

Fix some visual bugs
8 changes: 8 additions & 0 deletions .changeset/warm-jeans-sit.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
"@blockchain-lab-um/extended-verification": patch
"@blockchain-lab-um/did-provider-key": patch
"@blockchain-lab-um/veramo-datamanager": patch
"@blockchain-lab-um/utils": patch
---

Build packages with Tsup
5 changes: 5 additions & 0 deletions .changeset/witty-apes-repair.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@blockchain-lab-um/masca": patch
---

Added migration for legacy state when importing state
8 changes: 0 additions & 8 deletions .ci.prettierignore

This file was deleted.

111 changes: 0 additions & 111 deletions .eslintrc.cjs

This file was deleted.

6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
main:
name: Nx Cloud - Main Job
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.14.0
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
Expand All @@ -21,15 +21,15 @@ jobs:
number-of-agents: 4
main-branch-name: 'develop'
init-commands: |
npx nx-cloud record -- pnpm exec prettier . --ignore-path .ci.prettierignore --check
npx nx-cloud record -- pnpm exec biome check --config-path configs .
parallel-commands-on-agents: |
pnpm exec nx run-many --target=lint --parallel=4
pnpm exec nx run-many --target=test:ci --parallel=4
pnpm exec nx run-many --target=build --parallel=4

agents:
name: Nx Cloud - Agents
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.14.0
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cron.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
jobs:
main:
name: Nx Cloud - Cron Job
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.13.0
uses: nrwl/ci/.github/workflows/nx-cloud-main.yml@v0.14.0
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
Expand All @@ -21,7 +21,7 @@ jobs:

agents:
name: Nx Cloud - Agents
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.13.0
uses: nrwl/ci/.github/workflows/nx-cloud-agents.yml@v0.14.0
secrets:
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
with:
Expand Down
13 changes: 5 additions & 8 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,19 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: master
fetch-depth: 0
token: ${{ secrets.BCLABUM_GITHUB_TOKEN }}

- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.11.0
uses: pnpm/action-setup@v3

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version-file: '.nvmrc'
registry-url: https://registry.npmjs.org/
cache: 'pnpm'

Expand All @@ -42,7 +40,7 @@ jobs:
git config user.email "blockchain-lab@um.si"

- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.BCLABUM_PGP }}
git_user_signingkey: true
Expand All @@ -67,7 +65,6 @@ jobs:
commit: 'chore: version packages'
forcePublish: true
setupGitUser: false

env:
GITHUB_TOKEN: ${{ secrets.BCLABUM_GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
Expand Down
12 changes: 5 additions & 7 deletions .github/workflows/release-beta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,19 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
ref: develop
fetch-depth: 0
token: ${{ secrets.BCLABUM_GITHUB_TOKEN }}

- name: Install pnpm
uses: pnpm/action-setup@v2
with:
version: 8.11.0
uses: pnpm/action-setup@v3

- name: Install node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: 20.10.0
node-version-file: '.nvmrc'
registry-url: https://registry.npmjs.org/
cache: 'pnpm'

Expand All @@ -45,7 +43,7 @@ jobs:
git config user.email "blockchain-lab@um.si"

- name: Import GPG key
uses: crazy-max/ghaction-import-gpg@v5
uses: crazy-max/ghaction-import-gpg@v6
with:
gpg_private_key: ${{ secrets.BCLABUM_PGP }}
git_user_signingkey: true
Expand Down
Loading
Loading