From dd5a0c9933fa0030ed1c22a42b7bbe1426da6f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20N=C3=A9grier?= Date: Wed, 13 May 2020 16:17:58 +0200 Subject: [PATCH] Fixing domain name --- .github/workflows/build-and-deploy.yml | 1 + deeployer.libsonnet | 2 +- front/src/index.ts | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index 619bee06..9794c87b 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -88,6 +88,7 @@ jobs: - name: Run Cypress tests uses: cypress-io/github-action@v1 env: + # FIXME: for master, the URL is not the same! CYPRESS_BASE_URL: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com with: env: host=${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com,port=80 diff --git a/deeployer.libsonnet b/deeployer.libsonnet index 3ba149ae..3ede2509 100644 --- a/deeployer.libsonnet +++ b/deeployer.libsonnet @@ -2,7 +2,7 @@ local env = std.extVar("env"), local namespace = env.GITHUB_REF_SLUG, local tag = namespace, - local url = if namespace == "master" then "wordadventu.re" else namespace+".workadventure.test.thecodingmachine.com", + local url = if namespace == "master" then "workadventu.re" else namespace+".workadventure.test.thecodingmachine.com", "$schema": "https://raw.githubusercontent.com/thecodingmachine/deeployer/master/deeployer.schema.json", "containers": { "back": { diff --git a/front/src/index.ts b/front/src/index.ts index 21165681..e6c8ce40 100644 --- a/front/src/index.ts +++ b/front/src/index.ts @@ -25,4 +25,4 @@ let game = new Phaser.Game(config); window.addEventListener('resize', function (event) { game.scale.resize(window.innerWidth / RESOLUTION, window.innerHeight / RESOLUTION); -}); \ No newline at end of file +});