Unified Diff: .gitlab-ci.yml
Issue 29905561:
Noissue - build before testing (Closed)
Patch Set:
Created Oct. 9, 2018, 12:34 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: .gitlab-ci.yml |
| diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml |
| index 9dd936d44e76c0a6dbf00f26aeb5dd74baa96ab8..d07492c44730cc11fce0e8a9124afc79803884de 100644 |
| --- a/.gitlab-ci.yml |
| +++ b/.gitlab-ci.yml |
| @@ -21,8 +21,8 @@ |
| stages: |
| - prepare |
| - - test |
| - build |
| + - test |
| .dependencies: |
| script: &dependencies |
| @@ -57,25 +57,6 @@ stages: |
| - adblockpluschrome-*.zip |
| - adblockplusedge-*.appx |
| -prepare-dependencies: |
| - stage: prepare |
| - script: *dependencies |
| - cache: |
| - key: cache_$CI_COMMIT_SHA |
| - paths: |
| - - ./ |
| - policy: push |
| - |
| -test:gecko: |
| - extends: .test_template |
| - script: |
| - - npm run test-only -- -g gecko |
| - |
| -test:chrome: |
| - extends: .test_template |
| - script: |
| - - xvfb-run npm run test-only -- -g chrome |
| - |
| lint: |
| extends: .test_template |
| script: |
| @@ -97,3 +78,22 @@ build:edge: |
| PLATFORM: edge |
| # see https://issues.adblockplus.org/ticket/7024 |
| allow_failure: true |
| + |
|
tlucas
2018/10/09 12:36:58
Moving these lines is not necessary, but i figured
|
| +prepare-dependencies: |
| + stage: prepare |
| + script: *dependencies |
| + cache: |
| + key: cache_$CI_COMMIT_SHA |
| + paths: |
| + - ./ |
| + policy: push |
| + |
| +test:gecko: |
| + extends: .test_template |
| + script: |
| + - npm run test-only -- -g gecko |
| + |
| +test:chrome: |
| + extends: .test_template |
| + script: |
| + - xvfb-run npm run test-only -- -g chrome |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
