Merge branch 'dev' into cleanup-deps

.github/workflows/ci.yml

@@ -36,8 +36,8 @@ on:
  branches:
  - dev
  paths-ignore:
- - "**/dependabot.yml"
- - "**/README.md"
+ - '**/dependabot.yml'
+ - '**/README.md'
  pull_request:
  branches:
  - dev
@@ -167,13 +167,16 @@ jobs:
  run: |
  cargo fmt --all -- --check
 
+ - name: Enable corepack and pnpm
+ run: corepack enable && corepack enable pnpm
+
  - name: Tee-worker install npm deps
  working-directory: ./tee-worker/ts-tests
- run: corepack yarn install
+ run: pnpm install
 
  - name: Tee-worker check ts code format
  working-directory: ./tee-worker/ts-tests
- run: corepack yarn check-format
+ run: pnpm run check-format
 
  - name: Fail early
  if: failure()
@@ -224,7 +227,7 @@ jobs:
  - set-condition
  - sequentialise
  if: needs.set-condition.outputs.rebuild_tee == 'true'
- container: "litentry/litentry-tee-dev:latest"
+ container: 'litentry/litentry-tee-dev:latest'
  steps:
  - uses: actions/checkout@v4
 
@@ -475,6 +478,8 @@ jobs:
  uses: docker/build-push-action@v5
  with:
  context: .
+ build-contexts: local-stash=docker-image://localhost:5000/local-stash:latest
+ load: true
  file: tee-worker/build.Dockerfile
  tags: litentry/litentry-worker:latest
  target: deployed-worker
@@ -484,6 +489,8 @@ jobs:
  uses: docker/build-push-action@v5
  with:
  context: .
+ build-contexts: local-stash=docker-image://localhost:5000/local-stash:latest
+ load: true
  file: tee-worker/build.Dockerfile
  tags: litentry/litentry-cli:latest
  target: deployed-client
@@ -538,6 +545,9 @@ jobs:
  run: |
  docker load < litentry-parachain-dev.tar.gz
 
+ - name: Enable corepack and pnpm
+ run: corepack enable && corepack enable pnpm
+
  - name: Run ts tests for ${{ matrix.chain }}
  if: needs.set-condition.outputs.run_parachain_test == 'true'
  timeout-minutes: 30
@@ -686,6 +696,9 @@ jobs:
  docker load < litentry-tee.tar.gz
  docker images
 
+ - name: Enable corepack and pnpm
+ run: corepack enable && corepack enable pnpm
+
  - name: Generate parachain artefacts
  run: |
  ./tee-worker/scripts/litentry/generate_parachain_artefacts.sh
@@ -791,4 +804,4 @@ jobs:
  if: needs.set-condition.outputs.rebuild_tee == 'true'
  run: |
  docker push litentry/litentry-worker
- docker push litentry/litentry-cli
+ docker push litentry/litentry-cli

.gitignore

@@ -7,7 +7,6 @@
 
 **/node_modules/
 
-docker/yarn.lock
 docker/generated-*/
 tee-worker/docker/litentry/
 
@@ -18,6 +17,3 @@ recipe.json
 gethdata
 
 *.patch
-
-# Docker files
-docker/.yarn

Makefile

@@ -179,7 +179,7 @@ generate-docker-compose-rococo:
 
 .PHONY: update-ts-dep ## update ts-tests dependencies
 update-ts-dep:
- @cd ts-tests && npx npm-check-updates -u && corepack yarn
+ @cd ts-tests && pnpm dlx npm-check-updates -u && pnpm install
 
 # format
 

docker/package.json

@@ -4,7 +4,7 @@
  "main": "",
  "license": "GPL-3.0",
  "scripts": {
- "build": "cd node_modules/@open-web3/parachain-launch && yarn && yarn build",
+ "build": "cd node_modules/@open-web3/parachain-launch && corepack yarn install && corepack yarn run build",
  "start": "node_modules/.bin/parachain-launch"
  },
  "dependencies": {