Skip to content

Commit

Permalink
Merge pull request #674 from threefoldtech/development_upgrade
Browse files Browse the repository at this point in the history
release 2.0.0-rc13
  • Loading branch information
AhmedHanafy725 authored Jun 20, 2023
2 parents e3b6d7e + fbec810 commit 8e03d4b
Show file tree
Hide file tree
Showing 29 changed files with 77 additions and 77 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/weblets_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ on:
jobs:
build:
runs-on: ubuntu-latest
env:
NODE_OPTIONS: "--max-old-space-size=8192"

strategy:
matrix:
Expand All @@ -44,6 +42,8 @@ jobs:
yarn install
- name: Build
env:
NODE_OPTIONS: "--max-old-space-size=8192 --openssl-legacy-provider"
run: |
lerna run build --no-private
cd packages/weblets
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/weblets_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ concurrency:
jobs:
build-and-deploy:
runs-on: ubuntu-latest
env:
NODE_OPTIONS: "--max-old-space-size=8192"

strategy:
matrix:
Expand All @@ -46,6 +44,8 @@ jobs:
yarn install
- name: Build in case development
env:
NODE_OPTIONS: "--max-old-space-size=8192 --openssl-legacy-provider"
run: |
lerna run build --no-private
cd packages/weblets
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/weblets_cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ on:
jobs:
cypress-run:
runs-on: ubuntu-latest
env:
NODE_OPTIONS: "--max-old-space-size=8192"
strategy:
matrix:
node-version: [18.x]
Expand All @@ -35,6 +33,8 @@ jobs:
echo '${{ secrets.TFCHAIN_MNEMONICS }}' > packages/weblets/cypress.env.json
- name: Cypress run
uses: cypress-io/github-action@v5.7.1
env:
NODE_OPTIONS: "--max-old-space-size=8192 --openssl-legacy-provider"
with:
browser: chrome
start: yarn workspace @threefold/weblets serve:app
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"$schema": "node_modules/lerna/schemas/lerna-schema.json",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"npmClient": "yarn"
}
2 changes: 1 addition & 1 deletion packages/dashboard/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# stage 1
FROM node:16 as build
FROM node:18 as build

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion packages/dashboard/charts/tfgrid-dashboard/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: 1.0.6
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v2.0.0-rc12"
appVersion: "v2.0.0-rc13"
2 changes: 1 addition & 1 deletion packages/dashboard/charts/tfgrid-dashboard/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ replicaCount: 1
image:
repository: ghcr.io/threefoldtech/dashboard
pullPolicy: Always
tag: "2.0.0-rc12"
tag: "2.0.0-rc13"

env:
- name: "STELLAR_NETWORK"
Expand Down
4 changes: 2 additions & 2 deletions packages/dashboard/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@threefold/dashboard",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
Expand All @@ -19,7 +19,7 @@
"@polkadot/extension-dapp": "0.45.1",
"@polkadot/ui-keyring": "^2.2.1",
"@popperjs/core": "^2.11.5",
"@threefold/tfchain_client": "^2.0.0-rc12",
"@threefold/tfchain_client": "^2.0.0-rc13",
"@types/ip": "^1.1.0",
"@types/md5": "^2.3.2",
"apollo-cache-inmemory": "^1.6.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/grid_client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@threefold/grid_client",
"author": "Ahmed Hanafy",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"license": "ISC",
"homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/tree/development/packages/grid_client/README.md",
"repository": {
Expand All @@ -14,8 +14,8 @@
"dependencies": {
"@jimber/pkid": "1.0.4",
"@noble/secp256k1": "^1.7.1",
"@threefold/rmb_direct_client": "^2.0.0-rc12",
"@threefold/tfchain_client": "^2.0.0-rc12",
"@threefold/rmb_direct_client": "^2.0.0-rc13",
"@threefold/tfchain_client": "^2.0.0-rc13",
"algosdk": "^1.19.0",
"appdata-path": "^1.0.0",
"axios": "^0.27.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/grid_http_server/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@threefold/grid_http_server",
"author": "Ahmed Hanafy",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"license": "ISC",
"homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_http_server/README.md",
"repository": {
Expand All @@ -12,7 +12,7 @@
"access": "public"
},
"dependencies": {
"@threefold/grid_client": "^2.0.0-rc12",
"@threefold/grid_client": "^2.0.0-rc13",
"express": "^4.18.1",
"http-server": "^14.1.1",
"typescript": "^4.7.4"
Expand Down
8 changes: 4 additions & 4 deletions packages/grid_rmb_server/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@threefold/grid_rmb_server",
"author": "Ahmed Hanafy",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"license": "ISC",
"homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/grid_rmb_server/README.md",
"repository": {
Expand All @@ -12,12 +12,12 @@
"access": "public"
},
"dependencies": {
"@threefold/grid_client": "^2.0.0-rc12",
"@threefold/rmb_peer_server": "^2.0.0-rc12",
"@threefold/grid_client": "^2.0.0-rc13",
"@threefold/rmb_peer_server": "^2.0.0-rc13",
"typescript": "^4.7.4"
},
"devDependencies": {
"@threefold/rmb_peer_client": "^2.0.0-rc12",
"@threefold/rmb_peer_client": "^2.0.0-rc13",
"ts-node": "^10.9.1"
},
"main": "./dist/index.js",
Expand Down
2 changes: 1 addition & 1 deletion packages/playground/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# choose the Image which has Node installed already
FROM node:16 AS build
FROM node:18 AS build

# add arg for the network
ARG NETWORK
Expand Down
14 changes: 7 additions & 7 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@threefold/playground",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"private": true,
"scripts": {
"dev": "vite",
Expand All @@ -12,12 +12,14 @@
},
"dependencies": {
"@mdi/font": "^7.2.96",
"@threefold/grid_client": "^2.0.0-rc12",
"@threefold/grid_client": "^2.0.0-rc13",
"bip39": "^3.1.0",
"cryptr": "^6.2.0",
"decimal.js": "^10.4.3",
"front-matter": "^4.0.2",
"highlight.js": "^11.7.0",
"lodash": "^4.17.21",
"marked": "^5.0.4",
"md5": "^2.3.0",
"pinia": "^2.0.32",
"qrcode": "^1.5.1",
Expand All @@ -27,13 +29,12 @@
"vue": "^3.2.47",
"vue-router": "^4.1.6",
"vuetify": "^3.1.15",
"web-ssh-keygen": "^0.1.2",
"marked": "^5.0.4",
"front-matter": "^4.0.2"
"web-ssh-keygen": "^0.1.2"
},
"devDependencies": {
"@types/jsdom": "^21.1.0",
"@types/lodash": "^4.14.192",
"@types/marked": "^5.0.0",
"@types/node": "^18.14.2",
"@types/qrcode": "^1.5.0",
"@vitejs/plugin-vue": "^4.0.0",
Expand All @@ -49,7 +50,6 @@
"vite": "^4.1.4",
"vite-plugin-node-polyfills": "^0.7.0",
"vitest": "^0.29.1",
"vue-tsc": "^1.2.0",
"@types/marked": "^5.0.0"
"vue-tsc": "^1.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/playground/playground-charts/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: 0.1.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v2.0.0-rc12"
appVersion: "v2.0.0-rc13"
2 changes: 1 addition & 1 deletion packages/playground/playground-charts/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ image:
repository: ghcr.io/threefoldtech/playground
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "2.0.0-rc12"
tag: "2.0.0-rc13"

env:
- name: "MODE"
Expand Down
4 changes: 2 additions & 2 deletions packages/rmb_direct_client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@threefold/rmb_direct_client",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"repository": {
"type": "git",
"url": "https://github.com/threefoldtech/tfgrid-sdk-ts.git"
Expand All @@ -23,7 +23,7 @@
"dependencies": {
"@noble/secp256k1": "^1.7.1",
"@polkadot/api": "^8.9.1",
"@threefold/tfchain_client": "^2.0.0-rc12",
"@threefold/tfchain_client": "^2.0.0-rc13",
"base64url": "^3.0.1",
"bip39": "^3.1.0",
"buffer": "^6.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/rmb_peer_client/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@threefold/rmb_peer_client",
"author": "Ahmed Hanafy",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"license": "ISC",
"homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_client/README.md",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/rmb_peer_server/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@threefold/rmb_peer_server",
"author": "Ahmed Hanafy",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"license": "ISC",
"homepage": "https://github.com/threefoldtech/tfgrid-sdk-ts/blob/development/packages/rmb_peer_server/README.md",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/stats/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:16 AS build
FROM node:18 AS build

WORKDIR /app

Expand Down
2 changes: 1 addition & 1 deletion packages/stats/chart/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ version: 1.0.0
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v2.0.0-rc12"
appVersion: "v2.0.0-rc13"
2 changes: 1 addition & 1 deletion packages/stats/chart/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image:
repository: ghcr.io/threefoldtech/stats
pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: "2.0.0-rc12"
tag: "2.0.0-rc13"

imagePullSecrets: []
nameOverride: ""
Expand Down
2 changes: 1 addition & 1 deletion packages/stats/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@threefold/stats",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"private": true,
"scripts": {
"build": "rollup -c",
Expand Down
2 changes: 1 addition & 1 deletion packages/tfchain_client/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@threefold/tfchain_client",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"description": "A client for TF chain",
"private": false,
"publishConfig": {
Expand Down
4 changes: 2 additions & 2 deletions packages/weblets/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# choose the Image which has Node installed already
FROM node:16 AS build
FROM node:18 AS build

# add arg for the network
ARG NETWORK
Expand All @@ -14,7 +14,7 @@ WORKDIR /app
COPY . .

# increase the max memory for node
ENV NODE_OPTIONS="--max-old-space-size=8192"
ENV NODE_OPTIONS="--max-old-space-size=8192 --openssl-legacy-provider"

# install project dependencies
RUN yarn install && yarn workspace @threefold/weblets deps
Expand Down
4 changes: 2 additions & 2 deletions packages/weblets/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@threefold/weblets",
"version": "2.0.0-rc12",
"version": "2.0.0-rc13",
"private": true,
"scripts": {
"rollup-build": "rollup -c",
Expand Down Expand Up @@ -71,7 +71,7 @@
},
"dependencies": {
"@fortawesome/fontawesome-free": "^5.15.4",
"@threefold/grid_client": "^2.0.0-rc12",
"@threefold/grid_client": "^2.0.0-rc13",
"add": "^2.0.6",
"bip39": "^3.0.4",
"buffer": "^6.0.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/weblets/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"dependencies": {
"@open-wc/webpack-import-meta-loader": "^0.4.7",
"@threefold/grid_client": "2.0.0-rc12",
"@threefold/grid_client": "2.0.0-rc13",
"axios": "^0.24.0",
"bip39": "^3.0.4",
"buffer": "^6.0.3",
Expand Down
Loading

0 comments on commit 8e03d4b

Please sign in to comment.