Skip to content

Commit

Permalink
Merge branch 'development' into development_2.1
Browse files Browse the repository at this point in the history
  • Loading branch information
AhmedHanafy725 committed Jun 19, 2023
2 parents a118c95 + 5a52f09 commit fc03731
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dashboard_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playground_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/playground_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/stats_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weblets_build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weblets_cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/weblets_cypress.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
NODE_OPTIONS: "--max-old-space-size=8192"
strategy:
matrix:
node-version: [16.x]
node-version: [18.x]
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
23 changes: 9 additions & 14 deletions packages/dashboard/scripts/build-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,6 @@ echo -e "\nHINT:\e[1;10m The default selected STELLAR_NETWORK is\e[0m \e[1;32m$S
# Check the current selected tf-chain network, there are 5 modes dev, qa, test, main and custom
# the user should select one of them, otherwise will be devnet.

if [ -d public]
then
file="public/config.js"
fi

if [ -d dist ]
then
file="dist/config.js"
fi

if [ -z ${VERSION+x} ]
then
echo -e "\n\e[1;50m \e[1;31mVERSION is required!\e[0m\n \e[1;3mPlease set it by executing the following command."
Expand Down Expand Up @@ -144,10 +134,15 @@ window.configs = {
};
"

if [ -e $file ]
echo -e "\e[1;32m$configs"


if [ -d public ]
then
rm $file
echo $configs > public/config.js
fi

echo $configs > $file
echo -e "\e[1;32m$configs"
if [ -d dist ]
then
echo $configs > dist/config.js
fi
4 changes: 3 additions & 1 deletion packages/playground/src/utils/strings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@ export function generateName(length = 12, options?: GenerateNameOptions): string
const chars = "abcdefghijklmnopqrstuvwxyz";
const nums = "0123456789";

return options?.prefix ?? "" + randomChoice(chars) + generateString(chars + nums, length - 1) + options?.suffix ?? "";
return (
(options?.prefix ?? "") + randomChoice(chars) + generateString(chars + nums, length - 1) + (options?.suffix ?? "")
);
}

function generateString(from: string, length: number): string {
Expand Down

0 comments on commit fc03731

Please sign in to comment.