balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'georges-ligo-remote-master-only' into 'dev'

Browse Source 
CI: the job which installs from the remote OPAM repository should be executed only when the master branch is being built

See merge request ligolang/ligo!6
This commit is contained in:
Gabriel Alfour 2019-06-01 12:40:01 +00:00
commit c322b1cd13
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -17,7 +17,7 @@ stages:
.docker_build: &docker_build .docker_build: &docker_build
script: script:
- docker build -t $LIGO_REGISTRY_IMAGE:latest -f ./docker/Dockerfile . - docker build -t $LIGO_REGISTRY_IMAGE:latest -f ./docker/Dockerfile .
.before_script: &before_script .before_script: &before_script
before_script: before_script:
# Install dependencies # Install dependencies
@ -80,6 +80,8 @@ remote-repo-job:
#- opam install -y merlin #- opam install -y merlin
#- opam install -y ocp-indent #- opam install -y ocp-indent
#- opam user-setup install #- opam user-setup install
only:
- master
# Run a docker build without publishing to the registry # Run a docker build without publishing to the registry
build-current-docker-image: build-current-docker-image:
@ -94,7 +96,7 @@ build-current-docker-image:
build-and-publish-latest-docker-image: build-and-publish-latest-docker-image:
stage: build_and_deploy_docker stage: build_and_deploy_docker
<<: *docker <<: *docker
<<: *docker_build <<: *docker_build
after_script: after_script:
- docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD - docker login -u $LIGO_REGISTRY_USER -p $LIGO_REGISTRY_PASSWORD
- docker push $LIGO_REGISTRY_IMAGE:latest - docker push $LIGO_REGISTRY_IMAGE:latest