diff --git a/.circleci/config.yml b/.circleci/config.yml index e6334cc1c..28163ac81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,23 +136,6 @@ jobs: paths: - torus-website/app/dist - <<: *step_save_cache - build-lrc: - <<: *job_common - resource_class: large - steps: - - checkout: - path: ~/torus-website - - <<: *step_restore_cache - - <<: *step_setup_global_packages - - run: - name: "Build code for torus lrc website" - command: | - npm run build:lrc - - persist_to_workspace: - root: ~/ - paths: - - torus-website/app/dist - - <<: *step_save_cache deploy-testing: <<: *job_common_base steps: @@ -164,17 +147,6 @@ jobs: command: | ssh-keyscan -H testing.tor.us >> ~/.ssh/known_hosts tar czf - dist/ | ssh ubuntu@testing.tor.us "rm -rf ~/testing-torus-website/* && tar -zxf - -C ~/testing-torus-website/" - deploy-lrc: - <<: *job_common_base - steps: - - attach_workspace: - at: ~/ - - add_ssh_keys - - run: - name: "Deploy Over SSH" - command: | - ssh-keyscan -H lrc.tor.us >> ~/.ssh/known_hosts - tar czf - dist/ | ssh ubuntu@lrc.tor.us "rm -rf ~/lrc-torus-website/* && tar -zxf - -C ~/lrc-torus-website/" # ------------------------ # alpha configurations # ------------------------ @@ -188,92 +160,23 @@ jobs: - run: name: "Build code for torus alpha website" command: | - npm run build:alpha - - persist_to_workspace: - root: ~/ - paths: - - torus-website/app/dist - - <<: *step_save_cache - build-alpha1: - <<: *job_common - steps: - - checkout: - path: ~/torus-website - - <<: *step_restore_cache - - <<: *step_setup_global_packages - - run: - name: "Build code for torus alpha1 website" - command: | - npm run build:alpha1 - - persist_to_workspace: - root: ~/ - paths: - - torus-website/app/dist - - <<: *step_save_cache - build-alpha2: - <<: *job_common - steps: - - checkout: - path: ~/torus-website - - <<: *step_restore_cache - - <<: *step_setup_global_packages - - run: - name: "Build code for torus alpha2 website" - command: | - npm run build:alpha2 - - persist_to_workspace: - root: ~/ - paths: - - torus-website/app/dist - - <<: *step_save_cache - build-alpha3: - <<: *job_common - steps: - - checkout: - path: ~/torus-website - - <<: *step_restore_cache - - <<: *step_setup_global_packages - - run: - name: "Build code for torus alpha3 website" - command: | - npm run build:alpha3 - - persist_to_workspace: - root: ~/ - paths: - - torus-website/app/dist - - <<: *step_save_cache - build-alpha4: - <<: *job_common - steps: - - checkout: - path: ~/torus-website - - <<: *step_restore_cache - - <<: *step_setup_global_packages - - run: - name: "Build code for torus alpha4 website" - command: | - npm run build:alpha4 - - persist_to_workspace: - root: ~/ - paths: - - torus-website/app/dist - - <<: *step_save_cache - build-alpha5: - <<: *job_common - steps: - - checkout: - path: ~/torus-website - - <<: *step_restore_cache - - <<: *step_setup_global_packages - - run: - name: "Build code for torus alpha5 website" - command: | - npm run build:alpha5 + npm run build:alpha-branches - persist_to_workspace: root: ~/ paths: - torus-website/app/dist - <<: *step_save_cache + deploy-alpha: + <<: *job_common_base + steps: + - attach_workspace: + at: ~/ + - add_ssh_keys + - run: + name: "Deploy Over SSH" + command: | + ssh-keyscan -H "$CIRCLE_BRANCH".tor.us >> ~/.ssh/known_hosts + tar czf - dist/ | ssh ubuntu@"$CIRCLE_BRANCH".tor.us "rm -rf ~/"$CIRCLE_BRANCH"-torus-website/* && tar -zxf - -C ~/"$CIRCLE_BRANCH"-torus-website/" # ------------------------ # alpha configurations # ------------------------ @@ -350,19 +253,6 @@ workflows: branches: only: - develop - - build-lrc: - filters: - branches: - only: - - develop - - deploy-lrc: - requires: - - build-lrc - - test-coverage - filters: - branches: - only: - - develop # ------------------------ # alpha configurations # ------------------------ @@ -370,7 +260,8 @@ workflows: filters: branches: only: - - alpha + - /^alpha.*/ + - lrc - deploy-alpha: requires: - build-alpha @@ -378,72 +269,5 @@ workflows: filters: branches: only: - - alpha - - build-alpha1: - filters: - branches: - only: - - alpha1 - - deploy-alpha1: - requires: - - build-alpha1 - - test-coverage - filters: - branches: - only: - - alpha1 - - build-alpha2: - filters: - branches: - only: - - alpha2 - - deploy-alpha2: - requires: - - build-alpha2 - - test-coverage - filters: - branches: - only: - - alpha2 - - build-alpha3: - filters: - branches: - only: - - alpha3 - - deploy-alpha3: - requires: - - build-alpha3 - - test-coverage - filters: - branches: - only: - - alpha3 - - build-alpha4: - filters: - branches: - only: - - alpha4 - - deploy-alpha4: - requires: - - build-alpha4 - - test-coverage - filters: - branches: - only: - - alpha4 - - build-alpha5: - filters: - branches: - only: - - alpha5 - - deploy-alpha5: - requires: - - build-alpha5 - - test-coverage - filters: - branches: - only: - - alpha5 -# ------------------------ -# alpha configurations -# ------------------------ + - /^alpha.*/ + - lrc \ No newline at end of file diff --git a/app/.env.alpha1 b/app/.env.alpha1 deleted file mode 100644 index 212719a37..000000000 --- a/app/.env.alpha1 +++ /dev/null @@ -1,55 +0,0 @@ -# base config -NODE_ENV=production -VUE_APP_TORUS_BUILD_ENV=alpha -VUE_APP_BASE_ROUTE=https://alpha1.tor.us -# node list -VUE_APP_PROXY_ADDRESS=0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183 -VUE_APP_PROXY_NETWORK=ropsten -# client ids -VUE_APP_GOOGLE_CLIENT_ID=221898609709-obfn3p63741l5333093430j3qeiinaa8.apps.googleusercontent.com -VUE_APP_APPLE_CLIENT_ID=m1Q0gvDfOyZsJCZ3cucSQEe9XMvl9d9L -VUE_APP_DISCORD_CLIENT_ID=682533837464666198 -VUE_APP_FACEBOOK_CLIENT_ID=617201755556395 -VUE_APP_GITHUB_CLIENT_ID=PC2a4tfNRvXbT48t89J5am0oFM21Nxff -VUE_APP_KAKAO_CLIENT_ID=wpkcc7alGJjEgjaL6q5AWRqgRWHFsdTL -VUE_APP_LINE_CLIENT_ID=WN8bOmXKNRH1Gs8k475glfBP5gDZr9H1 -VUE_APP_LINKEDIN_CLIENT_ID=59YxSgx79Vl3Wi7tQUBqQTRTxWroTuoc -VUE_APP_REDDIT_CLIENT_ID=DjMpvEBI5dS3pQ -VUE_APP_TWITCH_CLIENT_ID=f5and8beke76mzutmics0zu4gw10dj -VUE_APP_TWITTER_CLIENT_ID=A7H8kkcmyFRlusJQ9dZiqBLraG2yWIsO -VUE_APP_WEIBO_CLIENT_ID=dhFGlWQMoACOI5oS5A1jFglp772OAWr1 -VUE_APP_WECHAT_CLIENT_ID=cewDD3i6F1vtHeV1KIbaxUZ8vJQjJZ8V -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_CLIENT_ID=P7PJuBCXIHP41lcyty0NEb7Lgf7Zme8Q -# normal verifiers -VUE_APP_GOOGLE_VERIFIER=google-lrc -VUE_APP_APPLE_VERIFIER=torus-auth0-apple-lrc -VUE_APP_DISCORD_VERIFIER=discord-lrc -VUE_APP_FACEBOOK_VERIFIER=facebook-lrc -VUE_APP_GITHUB_VERIFIER=torus-auth0-github-lrc -VUE_APP_KAKAO_VERIFIER=torus-auth0-kakao-lrc -VUE_APP_LINE_VERIFIER=torus-auth0-line-lrc -VUE_APP_LINKEDIN_VERIFIER=torus-auth0-linkedin-lrc -VUE_APP_REDDIT_VERIFIER=reddit-lrc -VUE_APP_TWITCH_VERIFIER=twitch-lrc -VUE_APP_TWITTER_VERIFIER=torus-auth0-twitter-lrc -VUE_APP_WEIBO_VERIFIER=torus-auth0-weibo-lrc -VUE_APP_WECHAT_VERIFIER=torus-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_VERIFIER=torus-auth0-email-passwordless-lrc -# tkey linked login verifiers -VUE_APP_GOOGLE_LINKED_VERIFIER=tkey-google-lrc -VUE_APP_APPLE_LINKED_VERIFIER=tkey-auth0-apple-lrc -VUE_APP_DISCORD_LINKED_VERIFIER=tkey-discord-lrc -VUE_APP_FACEBOOK_LINKED_VERIFIER=tkey-facebook-lrc -VUE_APP_GITHUB_LINKED_VERIFIER=tkey-auth0-github-lrc -VUE_APP_KAKAO_LINKED_VERIFIER=tkey-auth0-kakao-lrc -VUE_APP_LINE_LINKED_VERIFIER=tkey-auth0-line-lrc -VUE_APP_LINKEDIN_LINKED_VERIFIER=tkey-auth0-linkedin-lrc -VUE_APP_REDDIT_LINKED_VERIFIER=tkey-reddit-lrc -VUE_APP_TWITCH_LINKED_VERIFIER=tkey-twitch-lrc -VUE_APP_TWITTER_LINKED_VERIFIER=tkey-auth0-twitter-lrc -VUE_APP_WEIBO_LINKED_VERIFIER=tkey-auth0-weibo-lrc -VUE_APP_WECHAT_LINKED_VERIFIER=tkey-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_LINKED_VERIFIER=tkey-auth0-email-passwordless-lrc -# tkey linked login verifier sub identifier -VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus -VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com \ No newline at end of file diff --git a/app/.env.alpha2 b/app/.env.alpha2 deleted file mode 100644 index 5ddb1d603..000000000 --- a/app/.env.alpha2 +++ /dev/null @@ -1,55 +0,0 @@ -# base config -NODE_ENV=production -VUE_APP_TORUS_BUILD_ENV=alpha -VUE_APP_BASE_ROUTE=https://alpha2.tor.us -# node list -VUE_APP_PROXY_ADDRESS=0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183 -VUE_APP_PROXY_NETWORK=ropsten -# client ids -VUE_APP_GOOGLE_CLIENT_ID=221898609709-obfn3p63741l5333093430j3qeiinaa8.apps.googleusercontent.com -VUE_APP_APPLE_CLIENT_ID=m1Q0gvDfOyZsJCZ3cucSQEe9XMvl9d9L -VUE_APP_DISCORD_CLIENT_ID=682533837464666198 -VUE_APP_FACEBOOK_CLIENT_ID=617201755556395 -VUE_APP_GITHUB_CLIENT_ID=PC2a4tfNRvXbT48t89J5am0oFM21Nxff -VUE_APP_KAKAO_CLIENT_ID=wpkcc7alGJjEgjaL6q5AWRqgRWHFsdTL -VUE_APP_LINE_CLIENT_ID=WN8bOmXKNRH1Gs8k475glfBP5gDZr9H1 -VUE_APP_LINKEDIN_CLIENT_ID=59YxSgx79Vl3Wi7tQUBqQTRTxWroTuoc -VUE_APP_REDDIT_CLIENT_ID=DjMpvEBI5dS3pQ -VUE_APP_TWITCH_CLIENT_ID=f5and8beke76mzutmics0zu4gw10dj -VUE_APP_TWITTER_CLIENT_ID=A7H8kkcmyFRlusJQ9dZiqBLraG2yWIsO -VUE_APP_WEIBO_CLIENT_ID=dhFGlWQMoACOI5oS5A1jFglp772OAWr1 -VUE_APP_WECHAT_CLIENT_ID=cewDD3i6F1vtHeV1KIbaxUZ8vJQjJZ8V -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_CLIENT_ID=P7PJuBCXIHP41lcyty0NEb7Lgf7Zme8Q -# normal verifiers -VUE_APP_GOOGLE_VERIFIER=google-lrc -VUE_APP_APPLE_VERIFIER=torus-auth0-apple-lrc -VUE_APP_DISCORD_VERIFIER=discord-lrc -VUE_APP_FACEBOOK_VERIFIER=facebook-lrc -VUE_APP_GITHUB_VERIFIER=torus-auth0-github-lrc -VUE_APP_KAKAO_VERIFIER=torus-auth0-kakao-lrc -VUE_APP_LINE_VERIFIER=torus-auth0-line-lrc -VUE_APP_LINKEDIN_VERIFIER=torus-auth0-linkedin-lrc -VUE_APP_REDDIT_VERIFIER=reddit-lrc -VUE_APP_TWITCH_VERIFIER=twitch-lrc -VUE_APP_TWITTER_VERIFIER=torus-auth0-twitter-lrc -VUE_APP_WEIBO_VERIFIER=torus-auth0-weibo-lrc -VUE_APP_WECHAT_VERIFIER=torus-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_VERIFIER=torus-auth0-email-passwordless-lrc -# tkey linked login verifiers -VUE_APP_GOOGLE_LINKED_VERIFIER=tkey-google-lrc -VUE_APP_APPLE_LINKED_VERIFIER=tkey-auth0-apple-lrc -VUE_APP_DISCORD_LINKED_VERIFIER=tkey-discord-lrc -VUE_APP_FACEBOOK_LINKED_VERIFIER=tkey-facebook-lrc -VUE_APP_GITHUB_LINKED_VERIFIER=tkey-auth0-github-lrc -VUE_APP_KAKAO_LINKED_VERIFIER=tkey-auth0-kakao-lrc -VUE_APP_LINE_LINKED_VERIFIER=tkey-auth0-line-lrc -VUE_APP_LINKEDIN_LINKED_VERIFIER=tkey-auth0-linkedin-lrc -VUE_APP_REDDIT_LINKED_VERIFIER=tkey-reddit-lrc -VUE_APP_TWITCH_LINKED_VERIFIER=tkey-twitch-lrc -VUE_APP_TWITTER_LINKED_VERIFIER=tkey-auth0-twitter-lrc -VUE_APP_WEIBO_LINKED_VERIFIER=tkey-auth0-weibo-lrc -VUE_APP_WECHAT_LINKED_VERIFIER=tkey-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_LINKED_VERIFIER=tkey-auth0-email-passwordless-lrc -# tkey linked login verifier sub identifier -VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus -VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com \ No newline at end of file diff --git a/app/.env.alpha3 b/app/.env.alpha3 deleted file mode 100644 index e937770d9..000000000 --- a/app/.env.alpha3 +++ /dev/null @@ -1,55 +0,0 @@ -# base config -NODE_ENV=production -VUE_APP_TORUS_BUILD_ENV=alpha -VUE_APP_BASE_ROUTE=https://alpha3.tor.us -# node list -VUE_APP_PROXY_ADDRESS=0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183 -VUE_APP_PROXY_NETWORK=ropsten -# client ids -VUE_APP_GOOGLE_CLIENT_ID=221898609709-obfn3p63741l5333093430j3qeiinaa8.apps.googleusercontent.com -VUE_APP_APPLE_CLIENT_ID=m1Q0gvDfOyZsJCZ3cucSQEe9XMvl9d9L -VUE_APP_DISCORD_CLIENT_ID=682533837464666198 -VUE_APP_FACEBOOK_CLIENT_ID=617201755556395 -VUE_APP_GITHUB_CLIENT_ID=PC2a4tfNRvXbT48t89J5am0oFM21Nxff -VUE_APP_KAKAO_CLIENT_ID=wpkcc7alGJjEgjaL6q5AWRqgRWHFsdTL -VUE_APP_LINE_CLIENT_ID=WN8bOmXKNRH1Gs8k475glfBP5gDZr9H1 -VUE_APP_LINKEDIN_CLIENT_ID=59YxSgx79Vl3Wi7tQUBqQTRTxWroTuoc -VUE_APP_REDDIT_CLIENT_ID=DjMpvEBI5dS3pQ -VUE_APP_TWITCH_CLIENT_ID=f5and8beke76mzutmics0zu4gw10dj -VUE_APP_TWITTER_CLIENT_ID=A7H8kkcmyFRlusJQ9dZiqBLraG2yWIsO -VUE_APP_WEIBO_CLIENT_ID=dhFGlWQMoACOI5oS5A1jFglp772OAWr1 -VUE_APP_WECHAT_CLIENT_ID=cewDD3i6F1vtHeV1KIbaxUZ8vJQjJZ8V -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_CLIENT_ID=P7PJuBCXIHP41lcyty0NEb7Lgf7Zme8Q -# normal verifiers -VUE_APP_GOOGLE_VERIFIER=google-lrc -VUE_APP_APPLE_VERIFIER=torus-auth0-apple-lrc -VUE_APP_DISCORD_VERIFIER=discord-lrc -VUE_APP_FACEBOOK_VERIFIER=facebook-lrc -VUE_APP_GITHUB_VERIFIER=torus-auth0-github-lrc -VUE_APP_KAKAO_VERIFIER=torus-auth0-kakao-lrc -VUE_APP_LINE_VERIFIER=torus-auth0-line-lrc -VUE_APP_LINKEDIN_VERIFIER=torus-auth0-linkedin-lrc -VUE_APP_REDDIT_VERIFIER=reddit-lrc -VUE_APP_TWITCH_VERIFIER=twitch-lrc -VUE_APP_TWITTER_VERIFIER=torus-auth0-twitter-lrc -VUE_APP_WEIBO_VERIFIER=torus-auth0-weibo-lrc -VUE_APP_WECHAT_VERIFIER=torus-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_VERIFIER=torus-auth0-email-passwordless-lrc -# tkey linked login verifiers -VUE_APP_GOOGLE_LINKED_VERIFIER=tkey-google-lrc -VUE_APP_APPLE_LINKED_VERIFIER=tkey-auth0-apple-lrc -VUE_APP_DISCORD_LINKED_VERIFIER=tkey-discord-lrc -VUE_APP_FACEBOOK_LINKED_VERIFIER=tkey-facebook-lrc -VUE_APP_GITHUB_LINKED_VERIFIER=tkey-auth0-github-lrc -VUE_APP_KAKAO_LINKED_VERIFIER=tkey-auth0-kakao-lrc -VUE_APP_LINE_LINKED_VERIFIER=tkey-auth0-line-lrc -VUE_APP_LINKEDIN_LINKED_VERIFIER=tkey-auth0-linkedin-lrc -VUE_APP_REDDIT_LINKED_VERIFIER=tkey-reddit-lrc -VUE_APP_TWITCH_LINKED_VERIFIER=tkey-twitch-lrc -VUE_APP_TWITTER_LINKED_VERIFIER=tkey-auth0-twitter-lrc -VUE_APP_WEIBO_LINKED_VERIFIER=tkey-auth0-weibo-lrc -VUE_APP_WECHAT_LINKED_VERIFIER=tkey-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_LINKED_VERIFIER=tkey-auth0-email-passwordless-lrc -# tkey linked login verifier sub identifier -VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus -VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com \ No newline at end of file diff --git a/app/.env.alpha4 b/app/.env.alpha4 deleted file mode 100644 index 175e4ee14..000000000 --- a/app/.env.alpha4 +++ /dev/null @@ -1,55 +0,0 @@ -# base config -NODE_ENV=production -VUE_APP_TORUS_BUILD_ENV=alpha -VUE_APP_BASE_ROUTE=https://alpha4.tor.us -# node list -VUE_APP_PROXY_ADDRESS=0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183 -VUE_APP_PROXY_NETWORK=ropsten -# client ids -VUE_APP_GOOGLE_CLIENT_ID=221898609709-obfn3p63741l5333093430j3qeiinaa8.apps.googleusercontent.com -VUE_APP_APPLE_CLIENT_ID=m1Q0gvDfOyZsJCZ3cucSQEe9XMvl9d9L -VUE_APP_DISCORD_CLIENT_ID=682533837464666198 -VUE_APP_FACEBOOK_CLIENT_ID=617201755556395 -VUE_APP_GITHUB_CLIENT_ID=PC2a4tfNRvXbT48t89J5am0oFM21Nxff -VUE_APP_KAKAO_CLIENT_ID=wpkcc7alGJjEgjaL6q5AWRqgRWHFsdTL -VUE_APP_LINE_CLIENT_ID=WN8bOmXKNRH1Gs8k475glfBP5gDZr9H1 -VUE_APP_LINKEDIN_CLIENT_ID=59YxSgx79Vl3Wi7tQUBqQTRTxWroTuoc -VUE_APP_REDDIT_CLIENT_ID=DjMpvEBI5dS3pQ -VUE_APP_TWITCH_CLIENT_ID=f5and8beke76mzutmics0zu4gw10dj -VUE_APP_TWITTER_CLIENT_ID=A7H8kkcmyFRlusJQ9dZiqBLraG2yWIsO -VUE_APP_WEIBO_CLIENT_ID=dhFGlWQMoACOI5oS5A1jFglp772OAWr1 -VUE_APP_WECHAT_CLIENT_ID=cewDD3i6F1vtHeV1KIbaxUZ8vJQjJZ8V -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_CLIENT_ID=P7PJuBCXIHP41lcyty0NEb7Lgf7Zme8Q -# normal verifiers -VUE_APP_GOOGLE_VERIFIER=google-lrc -VUE_APP_APPLE_VERIFIER=torus-auth0-apple-lrc -VUE_APP_DISCORD_VERIFIER=discord-lrc -VUE_APP_FACEBOOK_VERIFIER=facebook-lrc -VUE_APP_GITHUB_VERIFIER=torus-auth0-github-lrc -VUE_APP_KAKAO_VERIFIER=torus-auth0-kakao-lrc -VUE_APP_LINE_VERIFIER=torus-auth0-line-lrc -VUE_APP_LINKEDIN_VERIFIER=torus-auth0-linkedin-lrc -VUE_APP_REDDIT_VERIFIER=reddit-lrc -VUE_APP_TWITCH_VERIFIER=twitch-lrc -VUE_APP_TWITTER_VERIFIER=torus-auth0-twitter-lrc -VUE_APP_WEIBO_VERIFIER=torus-auth0-weibo-lrc -VUE_APP_WECHAT_VERIFIER=torus-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_VERIFIER=torus-auth0-email-passwordless-lrc -# tkey linked login verifiers -VUE_APP_GOOGLE_LINKED_VERIFIER=tkey-google-lrc -VUE_APP_APPLE_LINKED_VERIFIER=tkey-auth0-apple-lrc -VUE_APP_DISCORD_LINKED_VERIFIER=tkey-discord-lrc -VUE_APP_FACEBOOK_LINKED_VERIFIER=tkey-facebook-lrc -VUE_APP_GITHUB_LINKED_VERIFIER=tkey-auth0-github-lrc -VUE_APP_KAKAO_LINKED_VERIFIER=tkey-auth0-kakao-lrc -VUE_APP_LINE_LINKED_VERIFIER=tkey-auth0-line-lrc -VUE_APP_LINKEDIN_LINKED_VERIFIER=tkey-auth0-linkedin-lrc -VUE_APP_REDDIT_LINKED_VERIFIER=tkey-reddit-lrc -VUE_APP_TWITCH_LINKED_VERIFIER=tkey-twitch-lrc -VUE_APP_TWITTER_LINKED_VERIFIER=tkey-auth0-twitter-lrc -VUE_APP_WEIBO_LINKED_VERIFIER=tkey-auth0-weibo-lrc -VUE_APP_WECHAT_LINKED_VERIFIER=tkey-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_LINKED_VERIFIER=tkey-auth0-email-passwordless-lrc -# tkey linked login verifier sub identifier -VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus -VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com \ No newline at end of file diff --git a/app/.env.alpha5 b/app/.env.alpha5 deleted file mode 100644 index fcb0bb20a..000000000 --- a/app/.env.alpha5 +++ /dev/null @@ -1,55 +0,0 @@ -# base config -NODE_ENV=production -VUE_APP_TORUS_BUILD_ENV=alpha -VUE_APP_BASE_ROUTE=https://alpha5.tor.us -# node list -VUE_APP_PROXY_ADDRESS=0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183 -VUE_APP_PROXY_NETWORK=ropsten -# client ids -VUE_APP_GOOGLE_CLIENT_ID=221898609709-obfn3p63741l5333093430j3qeiinaa8.apps.googleusercontent.com -VUE_APP_APPLE_CLIENT_ID=m1Q0gvDfOyZsJCZ3cucSQEe9XMvl9d9L -VUE_APP_DISCORD_CLIENT_ID=682533837464666198 -VUE_APP_FACEBOOK_CLIENT_ID=617201755556395 -VUE_APP_GITHUB_CLIENT_ID=PC2a4tfNRvXbT48t89J5am0oFM21Nxff -VUE_APP_KAKAO_CLIENT_ID=wpkcc7alGJjEgjaL6q5AWRqgRWHFsdTL -VUE_APP_LINE_CLIENT_ID=WN8bOmXKNRH1Gs8k475glfBP5gDZr9H1 -VUE_APP_LINKEDIN_CLIENT_ID=59YxSgx79Vl3Wi7tQUBqQTRTxWroTuoc -VUE_APP_REDDIT_CLIENT_ID=DjMpvEBI5dS3pQ -VUE_APP_TWITCH_CLIENT_ID=f5and8beke76mzutmics0zu4gw10dj -VUE_APP_TWITTER_CLIENT_ID=A7H8kkcmyFRlusJQ9dZiqBLraG2yWIsO -VUE_APP_WEIBO_CLIENT_ID=dhFGlWQMoACOI5oS5A1jFglp772OAWr1 -VUE_APP_WECHAT_CLIENT_ID=cewDD3i6F1vtHeV1KIbaxUZ8vJQjJZ8V -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_CLIENT_ID=P7PJuBCXIHP41lcyty0NEb7Lgf7Zme8Q -# normal verifiers -VUE_APP_GOOGLE_VERIFIER=google-lrc -VUE_APP_APPLE_VERIFIER=torus-auth0-apple-lrc -VUE_APP_DISCORD_VERIFIER=discord-lrc -VUE_APP_FACEBOOK_VERIFIER=facebook-lrc -VUE_APP_GITHUB_VERIFIER=torus-auth0-github-lrc -VUE_APP_KAKAO_VERIFIER=torus-auth0-kakao-lrc -VUE_APP_LINE_VERIFIER=torus-auth0-line-lrc -VUE_APP_LINKEDIN_VERIFIER=torus-auth0-linkedin-lrc -VUE_APP_REDDIT_VERIFIER=reddit-lrc -VUE_APP_TWITCH_VERIFIER=twitch-lrc -VUE_APP_TWITTER_VERIFIER=torus-auth0-twitter-lrc -VUE_APP_WEIBO_VERIFIER=torus-auth0-weibo-lrc -VUE_APP_WECHAT_VERIFIER=torus-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_VERIFIER=torus-auth0-email-passwordless-lrc -# tkey linked login verifiers -VUE_APP_GOOGLE_LINKED_VERIFIER=tkey-google-lrc -VUE_APP_APPLE_LINKED_VERIFIER=tkey-auth0-apple-lrc -VUE_APP_DISCORD_LINKED_VERIFIER=tkey-discord-lrc -VUE_APP_FACEBOOK_LINKED_VERIFIER=tkey-facebook-lrc -VUE_APP_GITHUB_LINKED_VERIFIER=tkey-auth0-github-lrc -VUE_APP_KAKAO_LINKED_VERIFIER=tkey-auth0-kakao-lrc -VUE_APP_LINE_LINKED_VERIFIER=tkey-auth0-line-lrc -VUE_APP_LINKEDIN_LINKED_VERIFIER=tkey-auth0-linkedin-lrc -VUE_APP_REDDIT_LINKED_VERIFIER=tkey-reddit-lrc -VUE_APP_TWITCH_LINKED_VERIFIER=tkey-twitch-lrc -VUE_APP_TWITTER_LINKED_VERIFIER=tkey-auth0-twitter-lrc -VUE_APP_WEIBO_LINKED_VERIFIER=tkey-auth0-weibo-lrc -VUE_APP_WECHAT_LINKED_VERIFIER=tkey-auth0-wechat-lrc -VUE_APP_HOSTED_EMAIL_PASSWORDLESS_LINKED_VERIFIER=tkey-auth0-email-passwordless-lrc -# tkey linked login verifier sub identifier -VUE_APP_LINKED_VERIFIER_SUBIDENTIFIER=torus -VUE_APP_LOGIN_DOMAIN=https://torus-test.auth0.com \ No newline at end of file diff --git a/app/.env.alpha b/app/.env.baselrc similarity index 97% rename from app/.env.alpha rename to app/.env.baselrc index 8d7cadf13..935420a37 100644 --- a/app/.env.alpha +++ b/app/.env.baselrc @@ -1,7 +1,5 @@ # base config NODE_ENV=production -VUE_APP_TORUS_BUILD_ENV=alpha -VUE_APP_BASE_ROUTE=https://alpha.tor.us # node list VUE_APP_PROXY_ADDRESS=0x4023d2a0D330bF11426B12C6144Cfb96B7fa6183 VUE_APP_PROXY_NETWORK=ropsten diff --git a/app/package.json b/app/package.json index e726e9322..21220e3fb 100644 --- a/app/package.json +++ b/app/package.json @@ -11,12 +11,7 @@ "build:binance": "cross-env VUE_APP_TORUS_BUILD_ENV=binance npm run pre-build && vue-cli-service build --mode binance && npm run post-build", "build:testing": "cross-env VUE_APP_TORUS_BUILD_ENV=testing npm run pre-build && vue-cli-service build --mode testing", "build:lrc": "cross-env VUE_APP_TORUS_BUILD_ENV=lrc npm run pre-build && vue-cli-service build --mode lrc", - "build:alpha": "cross-env VUE_APP_TORUS_BUILD_ENV=alpha npm run pre-build && vue-cli-service build --mode alpha", - "build:alpha1": "cross-env VUE_APP_TORUS_BUILD_ENV=alpha1 npm run pre-build && vue-cli-service build --mode alpha1", - "build:alpha2": "cross-env VUE_APP_TORUS_BUILD_ENV=alpha2 npm run pre-build && vue-cli-service build --mode alpha2", - "build:alpha3": "cross-env VUE_APP_TORUS_BUILD_ENV=alpha3 npm run pre-build && vue-cli-service build --mode alpha3", - "build:alpha4": "cross-env VUE_APP_TORUS_BUILD_ENV=alpha4 npm run pre-build && vue-cli-service build --mode alpha4", - "build:alpha5": "cross-env VUE_APP_TORUS_BUILD_ENV=alpha5 npm run pre-build && vue-cli-service build --mode alpha5", + "build:alpha-branches": ". ./scripts/buildAlpha.sh", "dev": "cross-env NODE_ENV=development VUE_APP_TORUS_BUILD_ENV=development node server.js", "locale": "node ./scripts/importLocales.js", "lint:js": "eslint --fix 'src/**/*.js'", diff --git a/app/scripts/buildAlpha.sh b/app/scripts/buildAlpha.sh new file mode 100644 index 000000000..010190961 --- /dev/null +++ b/app/scripts/buildAlpha.sh @@ -0,0 +1,5 @@ +export VUE_APP_TORUS_BUILD_ENV="$CIRCLE_BRANCH" +export VUE_APP_BASE_ROUTE="https://"$CIRCLE_BRANCH".tor.us" +echo $VUE_APP_TORUS_BUILD_ENV +echo $VUE_APP_BASE_ROUTE +cross-env VUE_APP_TORUS_BUILD_ENV="$CIRCLE_BRANCH" npm run pre-build && vue-cli-service build --mode baselrc \ No newline at end of file