Commit 73f6496b authored by Peterson, Peter's avatar Peterson, Peter
Browse files

Change when conda packages are built

parent 25e1b8d9

.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ create-wheel: 
  tags:

    - rse-multi-builder



publish-package:

conda-package:

  stage: publish

  dependencies:

    - create-wheel
@@ -254,11 +254,11 @@ publish-package: 
  before_script:

    - sudo chmod +x scripts/exec_script_on_docker.sh

  script:

    - bash scripts/exec_script_on_docker.sh publish_package.sh

    - docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY

    - time docker pull $CONTAINER_URL

    - time docker run -v $PWD:/opt/sans-backend -t $CONTAINER_URL bash -c "bash /opt/sans-backend/scripts/publish-package.sh"

  tags:

    - rse-multi-builder

  only:

    - tags



deploy-dev:

  stage: analysis-update

scripts/exec_script_on_docker.sh

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
#! /usr/bin/env bash

set -e



SCRIPT=$1



sudo rm -rf /tmp/sans-backend || true

sudo mkdir -p /tmp/sans-backend

sudo cp -r . /tmp/sans-backend

sudo chmod 777 /tmp/sans-backend

pushd /tmp/sans-backend

docker login --username=$CI_REGISTRY_USER --password=$CI_REGISTRY_PASSWORD $CI_REGISTRY

time docker pull $CONTAINER_URL

time docker run -v /SNS:/SNS -v /HFIR:/HFIR -v $PWD:/opt/sans-backend -t $CONTAINER_URL bash -c "bash /opt/sans-backend/${SCRIPT}"

scripts/publish_package.sh

+9 −4
Original line number Diff line number Diff line
@@ -9,7 +9,12 @@ conda build --output-folder . . -c neutrons -c mantid/label/nightly 
# Verify

conda-verify ./linux-64/drtsans-*.tar.bz2



# Deploy to Anaconda

# Deploy tags to anaconda.org

if [ -n "${CI_COMMIT_TAG}" ]; then

    CONDA_LABEL="main"

    if [ "${CI_COMMIT_TAG}" = "*rc*" ]; then

        CONDA_LABEL="rc"

    fi

    echo pushing $CI_COMMIT_REF_SLUG with label $CONDA_LABEL

    anaconda upload --label $CONDA_LABEL ./linux-64/drtsans-*.tar.bz2

fi