Skip to content

Commit 1be80b9

Browse files
authored
Merge pull request #19 from polywrap/origin-0.10-dev
merge origin-0.10-dev
2 parents 6b76001 + 08f3741 commit 1be80b9

23 files changed

Lines changed: 286 additions & 159 deletions

File tree

.github/workflows/cd-javascript.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
echo $(npm whoami --registry https://registry.npmjs.org/)
4646
4747
- name: Install JS dependencies
48-
run: yarn install --nonInteractive --frozen-lockfile
48+
run: (yarn install --nonInteractive --frozen-lockfile || yarn install --nonInteractive --frozen-lockfile)
4949

5050
- name: Build JS packages
5151
run: yarn build

.github/workflows/ci-javascript.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
${{ runner.os }}-yarn-
3737
3838
- name: Install dependencies
39-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
39+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
4040

4141
- name: Lint
4242
run: yarn run lint:ci
@@ -72,7 +72,7 @@ jobs:
7272
${{ runner.os }}-yarn-
7373
7474
- name: Install dependencies
75-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
75+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
7676

7777
- name: Build
7878
run: yarn build
@@ -113,7 +113,7 @@ jobs:
113113
${{ runner.os }}-yarn-
114114
115115
- name: Install dependencies
116-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
116+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
117117

118118
- name: Build
119119
run: yarn build

.github/workflows/ci-wrap-test-harness.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ jobs:
7373
${{ runner.os }}-yarn-
7474
7575
- name: Install dependencies
76-
run: yarn install --nonInteractive --frozen-lockfile --prefer-offline
76+
run: (yarn install --nonInteractive --frozen-lockfile --prefer-offline || yarn install --nonInteractive --frozen-lockfile --prefer-offline)
7777
working-directory: ./toolchain
7878

7979
- name: Build toolchain

.github/workflows/release-pr.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -115,25 +115,13 @@ jobs:
115115
with:
116116
node-version: '${{env.NVMRC}}'
117117

118-
- name: Install Rust
119-
uses: actions-rs/toolchain@v1
120-
with:
121-
toolchain: nightly
122-
override: true
123-
124118
- name: Set Git Identity
125119
run: |
126120
git config --global user.name '${{env.BUILD_BOT}}'
127121
git config --global user.email '${{env.BUILD_BOT}}@users.noreply.github.com'
128122
env:
129123
GITHUB_TOKEN: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
130124

131-
- name: Apply Rust Version & Commit
132-
working-directory: ./packages/wasm/rs
133-
run: |
134-
cargo install cargo-edit
135-
cargo set-version $(cat ../../../VERSION)
136-
137125
- name: Apply Node Version & Commit
138126
run: |
139127
yarn
@@ -143,7 +131,7 @@ jobs:
143131
144132
- name: Create Pull Request
145133
id: cpr
146-
uses: peter-evans/create-pull-request@v3
134+
uses: peter-evans/create-pull-request@v5
147135
with:
148136
token: ${{ secrets.POLYWRAP_BUILD_BOT_PAT }}
149137
push-to-fork: ${{env.RELEASE_FORKS}}/${{github.event.pull_request.base.repo.name}}
@@ -180,4 +168,4 @@ jobs:
180168
owner: context.repo.owner,
181169
repo: context.repo.repo,
182170
body: '**[Release PR Created](https://github.com/${{github.repository}}/pull/${{ steps.cpr.outputs.pull-request-number }}) (`${{env.RELEASE_VERSION}}`)**'
183-
})
171+
})

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.10.1
1+
0.10.1

lerna.json

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
{
22
"npmClient": "yarn",
33
"useWorkspaces": true,
4-
"version": "independent",
5-
"command": {
6-
"publish": {
7-
"ignoreChanges": [
8-
"templates-*"
9-
]
10-
}
11-
}
4+
"version": "independent"
125
}

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
]
1414
},
1515
"scripts": {
16-
"reset": "yarn clean && yarn && yarn build",
16+
"reset": "yarn clean && (yarn || yarn || yarn) && yarn build",
1717
"clean": "npx rimraf ./**/node_modules ./**/yarn.lock ./**/build ./**/coverage ./**/.polywrap",
1818
"install:test-wrappers": "lerna run generate:wrappers --scope @polywrap/test-cases",
1919
"build": "yarn build:core && yarn build:config && yarn build:core:client && yarn build:client && yarn install:test-wrappers",

packages/asyncify/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@polywrap/asyncify-js",
33
"description": "Async Wasm Imports Support Using Asyncify",
4-
"version": "0.10.0",
4+
"version": "0.10.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",

packages/client-config-builder/package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@polywrap/client-config-builder-js",
33
"description": "Polywrap JavaScript Client configuration",
4-
"version": "0.10.0",
4+
"version": "0.10.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
@@ -24,15 +24,15 @@
2424
},
2525
"dependencies": {
2626
"@polywrap/concurrent-plugin-js": "~0.10.0",
27-
"@polywrap/core-js": "0.10.0",
27+
"@polywrap/core-js": "0.10.1",
2828
"@polywrap/ethereum-provider-js": "npm:@polywrap/ethereum-provider-js@~0.3.1",
2929
"@polywrap/ethereum-provider-js-v1": "npm:@polywrap/ethereum-provider-js@~0.2.4",
3030
"@polywrap/file-system-plugin-js": "~0.10.0",
3131
"@polywrap/http-plugin-js": "~0.10.0",
3232
"@polywrap/logger-plugin-js": "~0.10.1",
33-
"@polywrap/uri-resolver-extensions-js": "0.10.0",
34-
"@polywrap/uri-resolvers-js": "0.10.0",
35-
"@polywrap/wasm-js": "0.10.0",
33+
"@polywrap/uri-resolver-extensions-js": "0.10.1",
34+
"@polywrap/uri-resolvers-js": "0.10.1",
35+
"@polywrap/wasm-js": "0.10.1",
3636
"base64-to-uint8array": "1.0.0"
3737
},
3838
"devDependencies": {

packages/client/package.json

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@polywrap/client-js",
33
"description": "Polywrap JavaScript Client",
4-
"version": "0.10.0",
4+
"version": "0.10.1",
55
"license": "MIT",
66
"repository": {
77
"type": "git",
@@ -23,27 +23,27 @@
2323
"build:readme": "yarn doc-snippets combine"
2424
},
2525
"dependencies": {
26-
"@polywrap/client-config-builder-js": "0.10.0",
27-
"@polywrap/core-client-js": "0.10.0",
28-
"@polywrap/core-js": "0.10.0",
29-
"@polywrap/msgpack-js": "0.10.0",
30-
"@polywrap/plugin-js": "0.10.0",
31-
"@polywrap/result": "0.10.0",
32-
"@polywrap/tracing-js": "0.10.0",
33-
"@polywrap/uri-resolver-extensions-js": "0.10.0",
34-
"@polywrap/uri-resolvers-js": "0.10.0",
35-
"@polywrap/wrap-manifest-types-js": "0.10.0"
26+
"@polywrap/client-config-builder-js": "0.10.1",
27+
"@polywrap/core-client-js": "0.10.1",
28+
"@polywrap/core-js": "0.10.1",
29+
"@polywrap/msgpack-js": "0.10.1",
30+
"@polywrap/plugin-js": "0.10.1",
31+
"@polywrap/result": "0.10.1",
32+
"@polywrap/tracing-js": "0.10.1",
33+
"@polywrap/uri-resolver-extensions-js": "0.10.1",
34+
"@polywrap/uri-resolvers-js": "0.10.1",
35+
"@polywrap/wrap-manifest-types-js": "0.10.1"
3636
},
3737
"devDependencies": {
38-
"@polywrap/cli-js": "0.10.0",
39-
"@polywrap/test-cases": "0.10.0",
38+
"@polywrap/cli-js": "~0.10.0",
39+
"@polywrap/test-cases": "0.10.1",
4040
"@types/jest": "29.5.0",
4141
"@types/prettier": "2.6.0",
4242
"@types/uuid": "8.3.0",
4343
"bignumber.js": "9.0.2",
4444
"doc-snippets": "~1.0.0",
4545
"jest": "29.5.0",
46-
"polywrap": "0.10.0",
46+
"polywrap": "~0.10.0",
4747
"rimraf": "3.0.2",
4848
"ts-jest": "29.1.0",
4949
"ts-loader": "8.0.17",

0 commit comments

Comments
 (0)