Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: move static sites to path #2060

Merged
merged 5 commits into from
Dec 5, 2023
Merged

feat: move static sites to path #2060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ff9defb
feat: move static sites to path
Nov 27, 2023
3a9b11b
Merge remote-tracking branch 'origin/master' into feat/move-to-paths
Nov 27, 2023
ac0bf29
Merge remote-tracking branch 'origin' into feat/move-to-paths
Dec 4, 2023
845574d
fix: remove play.decentraland change
Dec 4, 2023
10c126c
fix: builder url
Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 0 additions & 46 deletions .github/workflows/set-rollout-by-path-manual.yaml
View file
Open in desktop

This file was deleted.

50 changes: 0 additions & 50 deletions .github/workflows/set-rollout-by-path.yaml
View file
Open in desktop

This file was deleted.

24 changes: 11 additions & 13 deletions .github/workflows/set-rollout-manual.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Set rollout - Manual
name: Set rollout by path - Manual

on:
workflow_dispatch:
Expand All @@ -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 }}

Expand All @@ -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 }}
19 changes: 9 additions & 10 deletions .github/workflows/set-rollout.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }}

Expand All @@ -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 }}

Expand All @@ -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
6 changes: 3 additions & 3 deletions webapp/src/config/env/prod.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand Down
Loading