diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f17f69..5d4e504 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -27,15 +27,14 @@ variables: # - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY version: - image: python:3.7-stretch + #image: python:3.7-stretch + image: registry.gitlab.com/grassrootseconomics/cic-base-images/ci-version:8b5874c3 stage: version script: - mkdir -p ~/.ssh && chmod 700 ~/.ssh - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts - eval $(ssh-agent -s) - ssh-add <(echo "$SSH_PRIVATE_KEY") - - curl -o sbot -L https://github.com/restechnica/semverbot/releases/download/v$SEMVERBOT_VERSION/sbot-linux-amd64 - - chmod +x sbot - git remote set-url origin git@gitlab.com:grassrootseconomics/cic-internal-integration.git - export TAG=$(./sbot predict version -m auto) - | @@ -53,6 +52,8 @@ version: rules: - if: $CI_COMMIT_REF_PROTECTED == "true" when: always + - if: $CI_COMMIT_REF_NAME == "master" + when: always # runs on protected branches and pushes to repo build-push: @@ -68,6 +69,8 @@ build-push: rules: - if: $CI_COMMIT_REF_PROTECTED == "true" when: always + - if: $CI_COMMIT_REF_NAME == "master" + when: always deploy-dev: stage: deploy diff --git a/scripts/build.sh b/scripts/build.sh index 7c46071..744e0eb 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -9,3 +9,4 @@ docker-compose \ build \ --no-cache \ --parallel \ +--progress plain