From d1d73067fbba53cd782728d3e2fca1bf9d246d30 Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Wed, 3 Jul 2024 09:57:12 +0200 Subject: [PATCH 1/3] chore(js): set pnpm workspace correct Signed-off-by: Berend Sliedrecht --- wrappers/javascript/pnpm-workspace.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/wrappers/javascript/pnpm-workspace.yaml b/wrappers/javascript/pnpm-workspace.yaml index e69de29bb..18ec407ef 100644 --- a/wrappers/javascript/pnpm-workspace.yaml +++ b/wrappers/javascript/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +packages: + - 'packages/*' From ff17646483606fa746a2fa44a0e384246214646c Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Wed, 3 Jul 2024 10:30:49 +0200 Subject: [PATCH 2/3] chore(js): install dependencies with frozen lockfile Signed-off-by: Berend Sliedrecht --- .github/workflows/build.yml | 6 +++--- wrappers/javascript/package.json | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 616ec9268..7f6ce1138 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -356,7 +356,7 @@ jobs: pip install setuptools wheel twine auditwheel - name: Install dependencies - run: pnpm install + run: pnpm install --frozen-lockfile - name: Build run: pnpm build @@ -392,9 +392,9 @@ jobs: (github.event_name == 'workflow_dispatch' && github.event.inputs.publish-javascript-wrapper == 'true') run: | if [[ $(cat lerna.json | grep version | head -1 | grep dev) ]]; then - npx lerna publish from-package --no-push --no-private --yes --no-git-tag-version --dist-tag=alpha + pnpm release:alpha else - npx lerna publish from-package --no-push --no-private --yes --no-git-tag-version + pnpm release fi build-ios: diff --git a/wrappers/javascript/package.json b/wrappers/javascript/package.json index 76812d0f6..5bcba1a5c 100644 --- a/wrappers/javascript/package.json +++ b/wrappers/javascript/package.json @@ -24,7 +24,9 @@ "nodejs": "pnpm --cwd packages/aries-askar-nodejs", "react-native": "pnpm --cwd packages/aries-askar-react-native", "test:local-build": "LIB_ARIES_ASKAR_PATH=../../target/release pnpm test", - "set-version": "npx lerna version --exact --no-git-tag-version --no-push --yes" + "release": "lerna publish from-package --no-push --no-private --yes --no-git-tag-version", + "release:alpha": "pnpm release --dist-tag=alpha" + }, "devDependencies": { "@pnpm/eslint-config": "^1.1.0", From 6546058b4a1a163fc971a437a2d5e7727dce0712 Mon Sep 17 00:00:00 2001 From: Berend Sliedrecht Date: Wed, 3 Jul 2024 10:30:49 +0200 Subject: [PATCH 3/3] chore(js): install dependencies with frozen lockfile Signed-off-by: Berend Sliedrecht --- .github/workflows/build.yml | 2 +- wrappers/javascript/package.json | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7f6ce1138..32193c22b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -343,7 +343,7 @@ jobs: - uses: pnpm/action-setup@v4 with: - version: 8 + version: 9 - name: Fetch library artifacts uses: actions/download-artifact@v4 diff --git a/wrappers/javascript/package.json b/wrappers/javascript/package.json index 5bcba1a5c..3f9e38a28 100644 --- a/wrappers/javascript/package.json +++ b/wrappers/javascript/package.json @@ -26,7 +26,6 @@ "test:local-build": "LIB_ARIES_ASKAR_PATH=../../target/release pnpm test", "release": "lerna publish from-package --no-push --no-private --yes --no-git-tag-version", "release:alpha": "pnpm release --dist-tag=alpha" - }, "devDependencies": { "@pnpm/eslint-config": "^1.1.0",