Fixing the order

.gitlab-ci.yml

@@ -49,7 +49,7 @@ kustomize_build_apply:
     - echo $KUBECONFIG | base64 -d > /tmp/kubeconf
     - export KUBECONFIG=/tmp/kubeconf
   script:
-    - echo "You are on branch $CI_COMMIT_BRANCH"
+    - echo "You are on branch $CI_COMMIT_REF_NAME"
     - envsubst < deployment/jbrowse2-dep.yml > deployment/jbrowse2-dep.yaml
     - cat deployment/jbrowse2-dep.yaml
     - kubectl apply -k deployment
@@ -61,12 +61,12 @@ kustomize_build_apply:
     - cluster_access_test
     - build_nginx_with_jbrowse_config_file
   rules:
-    - when: always
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_REF_NAME  == "main"'
       variables:
         JBROWSE_HOSTNAME: "genomes.arendt.embl.de"
         RELEASE_LABEL: "prod"
         INGRESS_CLASS: "external-users"
+    - when: always
 
 clean_up_k8s_deployment:
   image: dtzar/helm-kubectl:3.8.2
@@ -81,9 +81,9 @@ clean_up_k8s_deployment:
   dependencies:
     - kustomize_build_apply
   rules:
-    - when: on_failure
-    - if: '$CI_COMMIT_BRANCH == "main"'
+    - if: '$CI_COMMIT_REF_NAME  == "main"'
       variables:
         JBROWSE_HOSTNAME: "genomes.arendt.embl.de"
         RELEASE_LABEL: "prod"
         INGRESS_CLASS: "external-users"
+    - when: on_failure