Skip to content

Commit

Permalink
Merge branch 'develop' into staging
Browse files Browse the repository at this point in the history
  • Loading branch information
froid1911 committed Aug 16, 2024
2 parents de3e775 + a28e9a8 commit 08f64e8
Show file tree
Hide file tree
Showing 24 changed files with 811 additions and 328 deletions.
2 changes: 2 additions & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/staging/makerdao/switchboard/
VITE_BASE_HREF=/
ASSET_URL=/

VITE_APP_REQUIRES_HARD_REFRESH=true

######## RENOWN CONFIG ########
# Renown instance to use for login
# VITE_RENOWN_URL=http://localhost:3000
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy-arbitrum-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ jobs:
--build-arg VITE_DISABLE_DELETE_CLOUD_DRIVES=true
--build-arg VITE_DISABLE_DELETE_LOCAL_DRIVES=true
--build-arg VITE_LOCAL_DRIVES_ENABLED=false
--build-arg VITE_SEARCH_BAR_ENABLED=false
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/arbitrum/switchboard/d/arbitrum
--build-arg VITE_RENOWN_CHAIN_ID=42161
--build-arg VITE_HIDE_DOCUMENT_MODEL_SELECTION_SETTINGS=true
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/build-and-deploy-arbitrum-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,12 @@ jobs:
--build-arg VITE_LOCAL_DRIVES_ENABLED=false
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/staging/arbitrum/switchboard/d/arbitrum
--build-arg VITE_RENOWN_CHAIN_ID=42161
--build-arg VITE_SEARCH_BAR_ENABLED=false
--build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
--build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}
--build-arg VITE_ARBITRUM_ALLOW_LIST=${{secrets.VITE_ARBITRUM_ALLOW_LIST}}
--build-arg VITE_HIDE_DOCUMENT_MODEL_SELECTION_SETTINGS=true
--build-arg SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
--build-arg SENTRY_ORG=${{ secrets.SENTRY_ORG }}
--build-arg SENTRY_PROJECT=${{ secrets.SENTRY_PROJECT }}
process_type: web
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy-makerdao-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
--build-arg VITE_ROUTER_BASENAME=/makerdao/connect
--build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
--build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}
--build-arg VITE_SEARCH_BAR_ENABLED=false
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/makerdao/switchboard/d/b443d823-3e4d-4e60-ae44-45edafd5f632
--build-arg VITE_RWA_ALLOW_LIST=${{secrets.VITE_RWA_ALLOW_LIST}}
process_type: web
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy-makerdao-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
--build-arg VITE_ROUTER_BASENAME=/staging/makerdao/connect
--build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
--build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}
--build-arg VITE_SEARCH_BAR_ENABLED=false
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/staging/makerdao/switchboard/d/280dd289-ec51-40f0-adad-c154967fc2b2
--build-arg VITE_RWA_ALLOW_LIST=${{secrets.VITE_RWA_ALLOW_LIST}}
process_type: web
6 changes: 6 additions & 0 deletions .github/workflows/build-and-deploy-powerhouse-develop.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,10 @@ jobs:
--build-arg VITE_BASE_HREF=/develop/powerhouse/connect/
--build-arg VITE_ROUTER_BASENAME=/develop/powerhouse/connect
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/develop/powerhouse/switchboard/d/core-dev
--build-arg VITE_SEARCH_BAR_ENABLED=false
--build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
--build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}
--build-arg SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
--build-arg SENTRY_ORG=${{ secrets.SENTRY_ORG }}
--build-arg SENTRY_PROJECT=${{ secrets.SENTRY_PROJECT }}
process_type: web
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy-powerhouse-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ jobs:
--build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
--build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/powerhouse/switchboard/d/powerhouse
--build-arg VITE_SEARCH_BAR_ENABLED=false
process_type: web
1 change: 1 addition & 0 deletions .github/workflows/build-and-deploy-powerhouse-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ jobs:
--build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }}
--build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}
--build-arg VITE_DEFAULT_DRIVES_URL=https://apps.powerhouse.io/staging/powerhouse/switchboard/d/powerhouse
--build-arg VITE_SEARCH_BAR_ENABLED=false
process_type: web
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,6 @@ out/
# Generated assets
public/icons.svg

.env.local
.env.local
# Sentry Config File
.env.sentry-build-plugin
15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,15 @@ FROM node:lts-alpine AS builder
ARG BASE_PATH=""
ENV BASE_PATH=${BASE_PATH}

ARG SENTRY_ORG=""
ENV SENTRY_ORG=${SENTRY_ORG}

ARG SENTRY_PROJECT=""
ENV SENTRY_PROJECT=${SENTRY_PROJECT}

ARG SENTRY_AUTH_TOKEN=""
ENV SENTRY_AUTH_TOKEN=${SENTRY_AUTH_TOKEN}

ARG VITE_BASE_HREF=""
ENV VITE_BASE_HREF=${VITE_BASE_HREF}

Expand Down Expand Up @@ -32,6 +41,12 @@ ENV VITE_ENABLED_EDITORS=${VITE_ENABLED_EDITORS}
ARG VITE_DISABLE_ADD_PUBLIC_DRIVES=false
ENV VITE_DISABLE_ADD_PUBLIC_DRIVES=${VITE_DISABLE_ADD_PUBLIC_DRIVES}

ARG VITE_RENOWN_URL="https://www.renown.id"
ENV VITE_RENOWN_URL=${VITE_RENOWN_URL}

ARG VITE_SEARCH_BAR_ENABLED=false
ENV VITE_SEARCH_BAR_ENABLED=${VITE_SEARCH_BAR_ENABLED}

ARG VITE_DISABLE_ADD_CLOUD_DRIVES=false
ENV VITE_DISABLE_ADD_CLOUD_DRIVES=${VITE_DISABLE_ADD_CLOUD_DRIVES}

Expand Down
Loading

0 comments on commit 08f64e8

Please sign in to comment.