diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 75a3846..2facc86 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -9,6 +9,12 @@ stages: services: - docker:19.03.12-dind +.only-master: &only-master + rules: + - if: '$CI_COMMIT_REF_NAME == "master"' + when: always + - when: never + .cljs-job: &cljs image: domaindrivenarchitecture/shadow-cljs cache: @@ -31,12 +37,6 @@ services: - mkdir -p /root/.lein - echo "{:auth {:repository-auth {#\"clojars\" {:username \"${CLOJARS_USER}\" :password \"${CLOJARS_TOKEN_DOMAINDRIVENARCHITECTURE}\" }}}}" > ~/.lein/profiles.clj -.only-master: &only-master - rules: - - if: '$CI_COMMIT_REF_NAME == "master"' - when: always - - when: never - test-cljs: <<: *cljs <<: *only-master @@ -159,8 +159,6 @@ nextcloud-integrationtest: - if: '$CI_COMMIT_BRANCH == "integration-local"' services: - docker:dind - dependencies: - - package-uberjar before_script: - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY - apk add bash