adjust ci

.gitlab-ci.yml

@@ -9,12 +9,6 @@ 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:
@@ -39,21 +33,18 @@ services:
 
 test-cljs:
   <<: *cljs
-  <<: *only-master
   stage: build_and_test
   script:
     - shadow-cljs compile test
 
 test-clj:
   <<: *clj
-  <<: *only-master
   stage: build_and_test
   script:
     - lein test
 
 test-schema:
   <<: *clj
-  <<: *only-master
   stage: build_and_test
   script:
     - lein uberjar
@@ -62,7 +53,7 @@ test-schema:
     paths:
       - target/uberjar
 
-.report-frontend:
+report-frontend:
   <<: *cljs
   stage: package
   script:
@@ -72,7 +63,7 @@ test-schema:
     paths:
       - target/frontend-build/build-report.html
 
-.package-frontend:
+package-frontend:
   <<: *cljs
   stage: package
   script:
@@ -87,7 +78,6 @@ test-schema:
 
 package-uberjar:
   <<: *clj
-  <<: *only-master
   stage: package
   script:
     - sha256sum target/uberjar/c4k-nextcloud-standalone.jar > target/uberjar/c4k-nextcloud-standalone.jar.sha256
@@ -96,11 +86,11 @@ package-uberjar:
     paths:
       - target/uberjar
 
-upload-clj-prerelease:
+upload-clj-release:
   <<: *clj
   stage: upload
   rules:
-    - if: '$CI_COMMIT_BRANCH == "master" && $CI_COMMIT_TAG == null'
+    - if: '$CI_COMMIT_TAG != null'
   script:
     - lein deploy clojars
 
@@ -159,5 +149,3 @@ nextcloud-integrationtest:
     - echo "---------- Integration test -------------"
     - pwd
     - cd ./src/test/resources/local-integration-test/ && ./setup-local-s3-on-k3d.sh
-
-