diff options
| author | Emilio Jesus Gallego Arias | 2020-06-05 17:35:05 +0200 |
|---|---|---|
| committer | Emilio Jesus Gallego Arias | 2020-06-05 17:35:05 +0200 |
| commit | 7bfd2bfe28dc8e780a36549ff848ac49cce1082f (patch) | |
| tree | ebb88a53fb0659daf3f1421ba590c3d53e26d6fb | |
| parent | c937f72bb804a74f89fb0ccf7aa7298f8d33eaf4 (diff) | |
| parent | 2beed70e255ee944d94a8ce09b2dfa562e1ce315 (diff) | |
Merge PR #12437: Fix ONLY_WINDOWS in .gitlab-ci.yml.
Reviewed-by: ejgallego
| -rw-r--r-- | .gitlab-ci.yml | 31 |
1 files changed, 26 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5e36034554..a6ed9be58d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -353,6 +353,9 @@ windows32: lint: stage: stage-1 + except: + variables: + - $ONLY_WINDOWS == "true" script: dev/lint-repository.sh dependencies: [] variables: @@ -362,6 +365,9 @@ lint: pkg:opam: stage: stage-1 + except: + variables: + - $ONLY_WINDOWS == "true" interruptible: true # OPAM will build out-of-tree so no point in importing artifacts dependencies: [] @@ -378,9 +384,6 @@ pkg:opam: .nix-template: image: nixorg/nix:latest # Minimal NixOS image which doesn't even contain git - except: - variables: - - $ONLY_WINDOWS == "true" interruptible: true stage: stage-1 variables: @@ -420,6 +423,9 @@ pkg:nix:deploy: only: - master - /^v.*\..*$/ + except: + variables: + - $ONLY_WINDOWS == "true" pkg:nix:deploy:channel: extends: .deploy-template @@ -444,8 +450,11 @@ pkg:nix:deploy:channel: pkg:nix: extends: .nix-template except: - - master - - /^v.*\..*$/ + refs: + - master + - /^v.*\..*$/ + variables: + - $ONLY_WINDOWS == "true" doc:refman: extends: .doc-template @@ -551,6 +560,10 @@ test-suite:edge+flambda: test-suite:edge:dune:dev: stage: stage-2 + except: + variables: + - $ONLY_WINDOWS == "true" + interruptible: true dependencies: - build:edge+flambda:dune:dev needs: @@ -571,6 +584,10 @@ test-suite:edge:dune:dev: test-suite:edge+4.11+trunk+dune: stage: stage-1 + except: + variables: + - $ONLY_WINDOWS == "true" + interruptible: true dependencies: [] script: - opam switch create 4.11.0 --empty @@ -856,6 +873,10 @@ plugin:ci-perennial: plugin:plugin-tutorial: stage: stage-1 + except: + variables: + - $ONLY_WINDOWS == "true" + interruptible: true dependencies: [] script: - ./configure -local -warn-error yes |