Skip to content

Commit

Permalink
Merge pull request #244 from DecentralCardGame/devnet
Browse files Browse the repository at this point in the history
Devnet
  • Loading branch information
lxgr-linux authored Dec 16, 2023
2 parents 5a3161c + 103a07c commit a7e426c
Show file tree
Hide file tree
Showing 26 changed files with 917 additions and 1,694 deletions.
6 changes: 5 additions & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#VITE_API_COSMOS="http://lxgr.xyz:1317"
#VITE_WS_TENDERMINT="http://lxgr.xyz:26657"
#VITE_APP_FAUCET="http://lxgr.xyz:4500/claimTokens"

VITE_API_COSMOS="https://cardchain.crowdcontrol.network/cosmos/"
VITE_WS_TENDERMINT="https://cardchain.crowdcontrol.network/tendermint/"
VITE_APP_FAUCET="https://cardchain.crowdcontrol.network/faucet/claimTokens"

VITE_APP_FAUCET_SITEKEY="ea68532a-a9e6-4f99-9361-db90a3071b72"
VITE_APP_ADDRESS_PREFIX=cc
VITE_APP_CHAIN_ID="cardtestnet-5"
VITE_APP_CHAIN_ID="cardtestnet-6"
VITE_APP_CHAIN_NAME="Cardchain"
VITE_APP_CARDIMG_MAXKB=500
VITE_APP_CARDIMG_SIZE_X=840
Expand Down
2 changes: 1 addition & 1 deletion .env.development
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

VITE_APP_FAUCET_SITEKEY="ea68532a-a9e6-4f99-9361-db90a3071b72"
VITE_APP_ADDRESS_PREFIX=cc
VITE_APP_CHAIN_ID="cardtestnet-5"
VITE_APP_CHAIN_ID="carddevnet-2"
VITE_APP_CHAIN_NAME="Cardchain"
VITE_APP_CARDIMG_MAXKB=500
VITE_APP_CARDIMG_SIZE_X=840
Expand Down
2 changes: 1 addition & 1 deletion .fleet/settings.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"backend.maxHeapSizeMb": 896
"backend.maxHeapSizeMb": 1568
}
20 changes: 12 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,25 @@ on:
pull_request:
types: [opened, labeled, unlabeled, synchronize]
workflow_dispatch:
env:
# Setting an environment variable with the value of a configuration variable
tag_name: ${{
contains(github.event.pull_request.labels.*.name, 'deploy_5173') && 'deploy_5173' ||
(contains(github.event.pull_request.labels.*.name, 'deploy_5174') && 'deploy_5175' || '')
}}



jobs:
run_pull:
if: ${{ env.tag_name != '' }}
name: run pull
runs-on: ubuntu-latest
env:
# Setting an environment variable with the value of a configuration variable
LABEL: ${{
contains(github.event.pull_request.labels.*.name, 'deploy_5173') && 'deploy_5173' ||
(contains(github.event.pull_request.labels.*.name, 'deploy_5174') && 'deploy_5174' || 'none')
}}

steps:
- name: exit
if: ${{ env.LABEL == 'none' }}
run: |
exit 1
- name: install ssh keys
# check this thread to understand why its needed:
# https://stackoverflow.com/a/70447517
Expand All @@ -26,6 +30,6 @@ jobs:
echo "${{ secrets.LXGR_DEPLOY_PRIV }}" > ~/.ssh/id_rsa
ssh-keyscan -H ${{ secrets.LXGR_HOST }} > ~/.ssh/known_hosts
- name: connect and pull
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$tag_name && git fetch && git checkout ${{ github.event.pull_request.base.ref }} && git pull && npm i && exit"
run: ssh ${{ secrets.LXGR_USER }}@${{ secrets.LXGR_HOST }} "cd ~/$LABEL && git fetch && git checkout ${{ github.event.pull_request.head.ref }} && git pull && npm i && npm run build && chgrp -R www-data ~/$LABEL && exit"
- name: cleanup
run: rm -rf ~/.ssh
229 changes: 18 additions & 211 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
"dependencies": {
"@cosmjs/encoding": "^0.29.3",
"@cosmjs/launchpad": "^0.27.0",
"@cosmjs/stargate": "^0.27.0",
"@cosmjs/proto-signing": "^0.27.0",
"@cosmjs/proto-signing": "^0.27.1",
"@cosmjs/stargate": "^0.27.1",
"@hcaptcha/vue3-hcaptcha": "^1.0.1",
"@headlessui/tailwindcss": "^0.2.0",
"@headlessui/vue": "^1.7.16",
Expand All @@ -13,8 +13,8 @@
"@tanstack/vue-query": "^4.13.5",
"axios": "^1.5.1",
"bignumber.js": "^9.1.0",
"crypto-js": "^4.1.1",
"decentralcardgame-cardchain-client-ts": "^0.0.17",
"crypto-js": "^4.2.0",
"decentralcardgame-cardchain-client-ts": "0.0.25",
"long": "^5.2.0",
"merge-images": "^2.0.0",
"pinia": "^2.0.23",
Expand Down Expand Up @@ -50,7 +50,7 @@
"sass": "^1.55.0",
"tailwindcss": "^3.3.3",
"typescript": "~4.8.4",
"vite": "^4.4.9",
"vite": "^4.5.0",
"vue-tsc": "^1.0.9"
},
"name": "@decentralcardgame/frontend",
Expand Down
Loading

0 comments on commit a7e426c

Please sign in to comment.