From ff9defbdfd90d73235a8e845c8c53545aa19e1b3 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Mon, 27 Nov 2023 16:13:59 -0300 Subject: [PATCH 1/3] feat: move static sites to path --- .../workflows/set-rollout-by-path-manual.yaml | 46 ----------------- .github/workflows/set-rollout-by-path.yaml | 50 ------------------- .github/workflows/set-rollout-manual.yaml | 24 ++++----- .github/workflows/set-rollout.yaml | 19 ++++--- webapp/src/config/env/dev.json | 2 +- webapp/src/config/env/prod.json | 2 +- 6 files changed, 22 insertions(+), 121 deletions(-) delete mode 100644 .github/workflows/set-rollout-by-path-manual.yaml delete mode 100644 .github/workflows/set-rollout-by-path.yaml diff --git a/.github/workflows/set-rollout-by-path-manual.yaml b/.github/workflows/set-rollout-by-path-manual.yaml deleted file mode 100644 index 7d26279ab2..0000000000 --- a/.github/workflows/set-rollout-by-path-manual.yaml +++ /dev/null @@ -1,46 +0,0 @@ -name: Set rollout by path - Manual - -on: - workflow_dispatch: - inputs: - packageVersion: - description: "NPM Version of the release (@dcl/marketplace-site)" - required: true - default: "" - deploymentEnvironment: - type: "choice" - description: "Deployment environment" - required: true - default: "zone" - options: - - zone - - today - - org - rolloutPercentage: - description: "The percentage for this rollout" - required: true - default: "100" - -jobs: - set-manual-by-path-rollout: - runs-on: ubuntu-latest - steps: - - uses: hmarr/debug-action@v2 - - name: Set Rollout - uses: decentraland/set-rollout-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - # Repo deployment info - ref: ${{ github.event.ref }} - sha: ${{ github.sha }} - - # CDN information - packageName: "@dcl/marketplace-site" - packageVersion: ${{ github.event.inputs.packageVersion }} - - # Rollout information - deploymentPath: "marketplace" - deploymentEnvironment: ${{ github.event.inputs.deploymentEnvironment }} - deploymentName: "_site" - percentage: ${{ github.event.inputs.rolloutPercentage }} diff --git a/.github/workflows/set-rollout-by-path.yaml b/.github/workflows/set-rollout-by-path.yaml deleted file mode 100644 index 7bd9640d97..0000000000 --- a/.github/workflows/set-rollout-by-path.yaml +++ /dev/null @@ -1,50 +0,0 @@ -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 - steps: - - uses: hmarr/debug-action@v2 - - # Dev - - name: Set Rollout - Development - uses: decentraland/set-rollout-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - # Repo deployment info - ref: ${{ github.event.deployment.ref }} - sha: ${{ github.event.deployment.sha }} - - # CDN information - packageName: ${{ github.event.deployment.payload.packageName }} - packageVersion: ${{ github.event.deployment.payload.packageVersion }} - - # Rollout information - deploymentPath: 'marketplace' - deploymentEnvironment: 'zone' - deploymentName: '_site' - percentage: 100 - - # Stg - - name: Set Rollout - Staging - uses: decentraland/set-rollout-action@v2 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - # Repo deployment info - ref: ${{ github.event.deployment.ref }} - sha: ${{ github.event.deployment.sha }} - - # CDN information - packageName: ${{ github.event.deployment.payload.packageName }} - packageVersion: ${{ github.event.deployment.payload.packageVersion }} - - # Rollout information - deploymentPath: 'marketplace' - deploymentEnvironment: 'today' - deploymentName: '_site' - percentage: 100 diff --git a/.github/workflows/set-rollout-manual.yaml b/.github/workflows/set-rollout-manual.yaml index 96c2d774e6..7d26279ab2 100644 --- 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 index 2508ab8463..7bd9640d97 100644 --- a/.github/workflows/set-rollout.yaml +++ b/.github/workflows/set-rollout.yaml @@ -1,4 +1,4 @@ -name: Set rollout +name: Set rollout by path on: [deployment_status] @@ -6,15 +6,12 @@ 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/dev.json b/webapp/src/config/env/dev.json index b3fbc0c78b..714835ce73 100644 --- a/webapp/src/config/env/dev.json +++ b/webapp/src/config/env/dev.json @@ -36,7 +36,7 @@ "DISCORD_URL": "https://dcl.gg/discord", "ENVIRONMENT": "development", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", - "EXPLORER_URL": "https://play.decentraland.zone", + "EXPLORER_URL": "https://decentraland.zone/play", "MARKETPLACE_URL": "https://decentraland.zone/marketplace", "PROFILE_URL": "https://decentraland.zone/profile", "SSO_URL": "https://id.decentraland.zone", diff --git a/webapp/src/config/env/prod.json b/webapp/src/config/env/prod.json index 290052e6b7..d5319cef89 100644 --- a/webapp/src/config/env/prod.json +++ b/webapp/src/config/env/prod.json @@ -35,7 +35,7 @@ "DISCORD_URL": "https://dcl.gg/discord", "ENVIRONMENT": "production", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", - "EXPLORER_URL": "https://play.decentraland.org", + "EXPLORER_URL": "https://decentraland.org/play", "MARKETPLACE_URL": "https://decentraland.org/marketplace", "PROFILE_URL": "https://decentraland.org/profile", "SSO_URL": "https://id.decentraland.org", From 845574d839f87f54aa33aaf6aef192a72863debb Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Mon, 4 Dec 2023 13:12:20 -0300 Subject: [PATCH 2/3] fix: remove play.decentraland change --- webapp/src/config/env/dev.json | 2 +- webapp/src/config/env/prod.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/webapp/src/config/env/dev.json b/webapp/src/config/env/dev.json index d12e2af17f..d2c14a2a4a 100644 --- a/webapp/src/config/env/dev.json +++ b/webapp/src/config/env/dev.json @@ -35,7 +35,7 @@ "DISCORD_URL": "https://dcl.gg/discord", "ENVIRONMENT": "development", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", - "EXPLORER_URL": "https://decentraland.zone/play", + "EXPLORER_URL": "https://play.decentraland.zone", "MARKETPLACE_URL": "https://decentraland.zone/marketplace", "PROFILE_URL": "https://decentraland.zone/profile", "SSO_URL": "https://id.decentraland.zone", diff --git a/webapp/src/config/env/prod.json b/webapp/src/config/env/prod.json index 48150fa405..7b9dee554a 100644 --- a/webapp/src/config/env/prod.json +++ b/webapp/src/config/env/prod.json @@ -35,7 +35,7 @@ "DISCORD_URL": "https://dcl.gg/discord", "ENVIRONMENT": "production", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", - "EXPLORER_URL": "https://decentraland.org/play", + "EXPLORER_URL": "https://play.decentraland.org", "MARKETPLACE_URL": "https://decentraland.org/marketplace", "PROFILE_URL": "https://decentraland.org/profile", "SSO_URL": "https://id.decentraland.org", From 10c126ccde1a4d8d719f47692141528376e32037 Mon Sep 17 00:00:00 2001 From: Melisa Anabella Rossi Date: Mon, 4 Dec 2023 13:14:00 -0300 Subject: [PATCH 3/3] fix: builder url --- webapp/src/config/env/prod.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/config/env/prod.json b/webapp/src/config/env/prod.json index 7b9dee554a..c4d1910b66 100644 --- 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",