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 2372197b7..000000000 --- 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/builder-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/builder-site" - packageVersion: ${{ github.event.inputs.packageVersion }} - - # Rollout information - deploymentPath: "builder" - 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 10f32f142..000000000 --- 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: 'builder' - 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: 'builder' - deploymentEnvironment: 'today' - deploymentName: '_site' - percentage: 100 diff --git a/.github/workflows/set-rollout-manual.yaml b/.github/workflows/set-rollout-manual.yaml index fa7167244..2372197b7 100644 --- a/.github/workflows/set-rollout-manual.yaml +++ b/.github/workflows/set-rollout-manual.yaml @@ -1,33 +1,33 @@ -name: Set rollout - Manual +name: Set rollout by path - Manual on: workflow_dispatch: inputs: packageVersion: - description: 'NPM Version of the release (@dcl/builder-site)' + description: "NPM Version of the release (@dcl/builder-site)" required: true - default: '' - deploymentDomain: - type: 'choice' - description: 'Deployment domain' + default: "" + deploymentEnvironment: + type: "choice" + description: "Deployment environment" required: true - default: '.zone' + default: "zone" options: - - .zone - - .today - - .org + - zone + - today + - org rolloutPercentage: - description: 'The percentage for this rollout' + description: "The percentage for this rollout" required: true - default: '100' + default: "100" jobs: - set-manual-rollout: + set-manual-by-path-rollout: runs-on: ubuntu-latest 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 }} @@ -36,10 +36,11 @@ jobs: sha: ${{ github.sha }} # CDN information - packageName: '@dcl/builder-site' + packageName: "@dcl/builder-site" packageVersion: ${{ github.event.inputs.packageVersion }} # Rollout information - deploymentDomain: builder.decentraland${{ github.event.inputs.deploymentDomain }} - deploymentName: '_site' + deploymentPath: "builder" + 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 8d6a802fa..10f32f142 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] @@ -11,7 +11,7 @@ jobs: # Dev - name: Set Rollout - Development - uses: decentraland/set-rollout-action@main + uses: decentraland/set-rollout-action@v2 with: token: ${{ secrets.GITHUB_TOKEN }} @@ -24,13 +24,14 @@ jobs: packageVersion: ${{ github.event.deployment.payload.packageVersion }} # Rollout information - deploymentDomain: 'builder.decentraland.zone' + deploymentPath: 'builder' + 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 }} @@ -43,6 +44,7 @@ jobs: packageVersion: ${{ github.event.deployment.payload.packageVersion }} # Rollout information - deploymentDomain: 'builder.decentraland.today' + deploymentPath: 'builder' + deploymentEnvironment: 'today' deploymentName: '_site' percentage: 100 diff --git a/package-lock.json b/package-lock.json index 2883ca463..14ee51ec0 100644 --- a/package-lock.json +++ b/package-lock.json @@ -45,7 +45,7 @@ "decentraland-ecs": "^6.6.1-20201020183014.commit-bdc29ef-hotfix", "decentraland-experiments": "^1.0.2", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.27.6", + "decentraland-ui": "^4.29.0", "ethers": "^5.6.8", "file-saver": "^2.0.1", "graphql": "^15.8.0", @@ -12473,9 +12473,9 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "node_modules/decentraland-ui": { - "version": "4.27.6", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.27.6.tgz", - "integrity": "sha512-1dJIj1CX+a9Aozl5ILmD/H43JWvGyx1PDsjQoL7rEF5fFEVC3VdeqLmDF4ChZa/++85A2XdxHXHKsVDGUmec+g==", + "version": "4.29.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.29.0.tgz", + "integrity": "sha512-5ZNDM8JS/VO/C7VlhPUkKFKiKtjutMIHoN85h0N5HzKJBNZdrrmAtJrSeQWlzVaEBo3G44vkbs0a+UXF01qD2A==", "dependencies": { "@dcl/schemas": "^9.7.0", "@dcl/ui-env": "^1.4.0", @@ -41820,9 +41820,9 @@ "integrity": "sha512-L4/bPD2fOeEdtFx+OnO3N81+/gsOkdensIuV9uFGYSN1mSTFaxHkWkhG8DOZ/8jlD0H2Qjkj6yDcWFaK+qu1Dg==" }, "decentraland-ui": { - "version": "4.27.6", - "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.27.6.tgz", - "integrity": "sha512-1dJIj1CX+a9Aozl5ILmD/H43JWvGyx1PDsjQoL7rEF5fFEVC3VdeqLmDF4ChZa/++85A2XdxHXHKsVDGUmec+g==", + "version": "4.29.0", + "resolved": "https://registry.npmjs.org/decentraland-ui/-/decentraland-ui-4.29.0.tgz", + "integrity": "sha512-5ZNDM8JS/VO/C7VlhPUkKFKiKtjutMIHoN85h0N5HzKJBNZdrrmAtJrSeQWlzVaEBo3G44vkbs0a+UXF01qD2A==", "requires": { "@dcl/schemas": "^9.7.0", "@dcl/ui-env": "^1.4.0", diff --git a/package.json b/package.json index 1e4a43d05..ad0f41eae 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,7 @@ "decentraland-ecs": "^6.6.1-20201020183014.commit-bdc29ef-hotfix", "decentraland-experiments": "^1.0.2", "decentraland-transactions": "^1.47.0", - "decentraland-ui": "^4.27.6", + "decentraland-ui": "^4.29.0", "ethers": "^5.6.8", "file-saver": "^2.0.1", "graphql": "^15.8.0", diff --git a/src/config/env/prod.json b/src/config/env/prod.json index 4fa40baf9..d264b877a 100644 --- a/src/config/env/prod.json +++ b/src/config/env/prod.json @@ -7,7 +7,7 @@ "ERC721_COLLECTION_BASE_URI": "https://peer.decentraland.org/lambdas/collections/standard/erc721/", "BUILDER_SERVER_URL": "https://builder-api.decentraland.org/v1", "MARKETPLACE_URL": "https://api.decentraland.org/v1", - "MARKETPLACE_WEB_URL": "https://market.decentraland.org", + "MARKETPLACE_WEB_URL": "https://decentraland.org/marketplace", "LAND_MANAGER_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/land-manager", "MARKETPLACE_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/marketplace", "RENTALS_GRAPH_URL": "https://api.thegraph.com/subgraphs/name/decentraland/rentals-ethereum-mainnet", @@ -27,13 +27,13 @@ "IPFS_URL": "https://ipfs.infura.io:5001/api/v0/add?pin=false", "EXPLORER_URL": "https://play.decentraland.org", "TRANSACTIONS_API_URL": "https://transactions-api.decentraland.org/v1", - "ACCOUNT_URL": "https://account.decentraland.org", + "ACCOUNT_URL": "https://decentraland.org/account", "DISCORD_URL": "https://dcl.gg/discord", "WEARABLES_ZIP_INFRA_URL": "https://docs.decentraland.org/decentraland/linked-wearables/#creating-linked-wearables-in-bulk", "MIN_SALE_VALUE_IN_WEI": "1000000000000000000", "FORUM_URL": "https://forum.decentraland.org", "WORLDS_CONTENT_SERVER": "https://worlds-content-server.decentraland.org", - "PROFILE_URL": "https://profile.decentraland.org", + "PROFILE_URL": "https://decentraland.org/profile", "SSO_URL": "https://id.decentraland.org", "SENTRY_DSN": "https://428e8d298fb3f0fbcea645314a4a388c@o4504361728212992.ingest.sentry.io/4505748381564928", "DCL_LISTS_SERVER": "https://dcl-lists.decentraland.org",