Merge pull request #111 from thecodingmachine/new-floor0

New map floor0
This commit is contained in:
David Négrier 2020-05-13 22:28:17 +02:00 committed by GitHub
commit 2e34b76a77
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 22 deletions

View File

@ -78,7 +78,7 @@ jobs:
- name: Add a comment in PR - name: Add a comment in PR
uses: unsplash/comment-on-pr@v1.2.0 uses: unsplash/comment-on-pr@v1.2.0
if: ${{ github.event_name == 'pull_request' }} if: ${{ env.GITHUB_REF_SLUG != 'master' }}
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with: with:
@ -87,8 +87,8 @@ jobs:
- name: Run Cypress tests - name: Run Cypress tests
uses: cypress-io/github-action@v1 uses: cypress-io/github-action@v1
if: ${{ env.GITHUB_REF_SLUG != 'master' }}
env: env:
# FIXME: for master, the URL is not the same!
CYPRESS_BASE_URL: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com CYPRESS_BASE_URL: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com
with: with:
env: host=${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com,port=80 env: host=${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com,port=80
@ -96,6 +96,17 @@ jobs:
wait-on: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com wait-on: https://${{ env.GITHUB_REF_SLUG }}.workadventure.test.thecodingmachine.com
working-directory: e2e working-directory: e2e
- name: Run Cypress tests in prod
uses: cypress-io/github-action@v1
if: ${{ env.GITHUB_REF_SLUG == 'master' }}
env:
CYPRESS_BASE_URL: https://workadventu.re
with:
env: host=workadventu.re
spec: cypress/integration/spec.js
wait-on: https://workadventu.re
working-directory: e2e
- name: "Upload the screenshot on test failure" - name: "Upload the screenshot on test failure"
uses: actions/upload-artifact@v1 uses: actions/upload-artifact@v1
if: failure() if: failure()

File diff suppressed because one or more lines are too long