Update .gitlab-ci.yml

This commit is contained in:
Dawid Masiukiewicz 2021-03-02 20:52:10 +00:00
parent e7bb51b704
commit 83cf803d0b

View file

@ -68,7 +68,7 @@ build_wasm:
paths: paths:
- build - build
rules: rules:
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_COMMIT_BRANCH == "master"'
when: always when: always
allow_failure: true allow_failure: true
@ -80,7 +80,7 @@ emscripten:
script: script:
- /bin/bash /build.sh - /bin/bash /build.sh
rules: rules:
- if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"' - if: '$CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master" || $CI_COMMIT_BRANCH == "master"'
when: always when: always
artifacts: artifacts:
expire_in: 1h expire_in: 1h
@ -102,4 +102,4 @@ pages:
artifacts: artifacts:
expire_in: 1h expire_in: 1h
paths: paths:
- public - public