diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4ecb1f5e3cceb0f70ca1efc671ab2f30f2c431a3..98f9d5ac44597c0206d6de02734cf81c830c79b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -4,14 +4,18 @@ default: test: rules: - - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: never script: - docker build -t testimage:latest . - docker run --rm -it testimage:latest tests/test.sh test_and_publish: rules: - - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH + - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "merge_request_event" + when: never script: - export VERSION=$(grep 'version <-' ascii_alignment_pileup.R | cut -f2 -d'"') - export IMAGE="${DOCKER_ORG}/${DOCKER_REPO}:${VERSION}" @@ -23,4 +27,3 @@ test_and_publish: - docker run --rm -it $IMAGE tests/test.sh - echo "${DOCKER_TOKEN}" | docker login -u "${DOCKER_USER}" --password-stdin - docker push $IMAGE - diff --git a/ascii_alignment_pileup.R b/ascii_alignment_pileup.R index 69d60e7103e7972f92e410a34c7a499d7a02a7d7..daebf344b20d98d873b6e60808744619adf37bff 100755 --- a/ascii_alignment_pileup.R +++ b/ascii_alignment_pileup.R @@ -29,7 +29,7 @@ against one or more regions specified in a BED file.\n" author <- "Author: Alexander Kanitz" affiliation <- "Affiliation: Biozentrum, University of Basel" email <- "Email: alexander.kanitz@alumni.ethz.ch" -version <- "1.0.3" +version <- "1.1.0" version_formatted <- paste("Version:", version, sep=" ") requirements <- c("optparse", "rtracklayer", "GenomicAlignments", "tools") requirements_txt <- paste("Requires:", paste(requirements, collapse=", "), sep=" ")