feat: move static sites to path (#2060)

decentraland · Dec 5, 2023 · 84c8b43 · 84c8b43
1 parent 63f3148
commit 84c8b43
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 122 deletions.
diff --git a/.github/workflows/set-rollout-by-path-manual.yaml b/.github/workflows/set-rollout-by-path-manual.yaml
diff --git a/.github/workflows/set-rollout-by-path.yaml b/.github/workflows/set-rollout-by-path.yaml
diff --git a/.github/workflows/set-rollout-manual.yaml b/.github/workflows/set-rollout-manual.yaml
@@ -1,4 +1,4 @@
-name: Set rollout - Manual
+name: Set rollout by path - Manual
 
 on:
   workflow_dispatch:
@@ -7,30 +7,27 @@ on:
         description: "NPM Version of the release (@dcl/marketplace-site)"
         required: true
         default: ""
-      deploymentDomain:
+      deploymentEnvironment:
         type: "choice"
-        description: "Deployment domain"
+        description: "Deployment environment"
         required: true
-        default: ".zone"
+        default: "zone"
         options:
-          - .zone
-          - .today
-          - .org
+          - zone
+          - today
+          - org
       rolloutPercentage:
         description: "The percentage for this rollout"
         required: true
         default: "100"
 
 jobs:
-  set-manual-rollout:
+  set-manual-by-path-rollout:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./webapp
     steps:
       - uses: hmarr/debug-action@v2
       - name: Set Rollout
-        uses: decentraland/set-rollout-action@main
+        uses: decentraland/set-rollout-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -43,6 +40,7 @@ jobs:
           packageVersion: ${{ github.event.inputs.packageVersion }}
 
           # Rollout information
-          deploymentDomain: market.decentraland${{ github.event.inputs.deploymentDomain }}
+          deploymentPath: "marketplace"
+          deploymentEnvironment: ${{ github.event.inputs.deploymentEnvironment }}
           deploymentName: "_site"
           percentage: ${{ github.event.inputs.rolloutPercentage }}
diff --git a/.github/workflows/set-rollout.yaml b/.github/workflows/set-rollout.yaml
@@ -1,20 +1,17 @@
-name: Set rollout
+name: Set rollout by path
 
 on: [deployment_status]
 
 jobs:
   set-rollout:
     if: ${{ github.event.deployment.task == 'upload-to-cdn' && github.event.deployment_status.state == 'success' }}
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ./webapp
     steps:
       - uses: hmarr/debug-action@v2
 
       # Dev
       - name: Set Rollout - Development
-        uses: decentraland/set-rollout-action@main
+        uses: decentraland/set-rollout-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -27,13 +24,14 @@ jobs:
           packageVersion: ${{ github.event.deployment.payload.packageVersion }}
 
           # Rollout information
-          deploymentDomain: "market.decentraland.zone"
-          deploymentName: "_site"
+          deploymentPath: 'marketplace'
+          deploymentEnvironment: 'zone'
+          deploymentName: '_site'
           percentage: 100
 
       # Stg
       - name: Set Rollout - Staging
-        uses: decentraland/set-rollout-action@main
+        uses: decentraland/set-rollout-action@v2
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -46,6 +44,7 @@ jobs:
           packageVersion: ${{ github.event.deployment.payload.packageVersion }}
 
           # Rollout information
-          deploymentDomain: "market.decentraland.today"
-          deploymentName: "_site"
+          deploymentPath: 'marketplace'
+          deploymentEnvironment: 'today'
+          deploymentName: '_site'
           percentage: 100
diff --git a/webapp/src/config/env/prod.json b/webapp/src/config/env/prod.json
@@ -22,7 +22,7 @@
   "MOON_PAY_API_KEY": "pk_live_3PEJQj5NyvQBdit7phd48cCyzDSZFGsg",
   "MOON_PAY_POLLING_DELAY": "6000",
   "MOON_PAY_WIDGET_URL": "https://buy.moonpay.io",
-  "BUILDER_URL": "https://builder.decentraland.org",
+  "BUILDER_URL": "https://decentraland.org/builder",
   "COINGECKO_API_URL": "https://api.coingecko.com/api/v3",
   "DOCS_URL": "https://docs.decentraland.org",
   "MARKETPLACE_ADAPTER_FEE_PER_MILLION": "25000",
@@ -36,8 +36,8 @@
   "ENVIRONMENT": "production",
   "MIN_SALE_VALUE_IN_WEI": "1000000000000000000",
   "EXPLORER_URL": "https://play.decentraland.org",
-  "MARKETPLACE_URL": "https://market.decentraland.org",
-  "PROFILE_URL": "https://profile.decentraland.org",
+  "MARKETPLACE_URL": "https://decentraland.org/marketplace",
+  "PROFILE_URL": "https://decentraland.org/profile",
   "SSO_URL": "https://id.decentraland.org",
   "SUBGRAPH_WORKER": "https://subgraph.decentraland.org",
   "SENTRY_DSN": "https://1dc401149e1c819b8477565c9cdd9b70@o4504361728212992.ingest.sentry.io/4505743351676928",