Merge branch 'ci/hookup_ide' into 'dev'

Ci/hookup ide

See merge request ligolang/ligo!396
This commit is contained in:
Jev Björsell 2020-02-07 18:19:59 +00:00
commit 2c26d0e5ba
2 changed files with 14 additions and 6 deletions

View File

@ -7,6 +7,7 @@ variables:
stages: stages:
- test - test
- ide
- build_and_package_binaries - build_and_package_binaries
- build_docker - build_docker
- build_and_deploy_docker - build_and_deploy_docker
@ -131,7 +132,7 @@ build-and-publish-latest-docker-image:
- sh scripts/build_docker_image.sh - sh scripts/build_docker_image.sh
- sh scripts/test_cli.sh - sh scripts/test_cli.sh
- 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_BASE_NAME:next - docker push ${LIGO_REGISTRY_IMAGE_BUILD:-ligolang/ligo}:next
only: only:
- dev - dev
@ -141,7 +142,7 @@ build-and-package-debian-9:
<<: *docker <<: *docker
# To run in sequence and save CPU usage, use stage: build_and_package_binaries # To run in sequence and save CPU usage, use stage: build_and_package_binaries
stage: test stage: test
variables: variables:
target_os_family: "debian" target_os_family: "debian"
target_os: "debian" target_os: "debian"
target_os_version: "9" target_os_version: "9"
@ -153,7 +154,7 @@ build-and-package-debian-10:
<<: *docker <<: *docker
# To run in sequence and save CPU usage, use stage: build_and_package_binaries # To run in sequence and save CPU usage, use stage: build_and_package_binaries
stage: test stage: test
variables: variables:
target_os_family: "debian" target_os_family: "debian"
target_os: "debian" target_os: "debian"
target_os_version: "10" target_os_version: "10"
@ -169,7 +170,7 @@ build-and-package-ubuntu-18-04:
<<: *docker <<: *docker
# To run in sequence and save CPU usage, use stage: build_and_package_binaries # To run in sequence and save CPU usage, use stage: build_and_package_binaries
stage: test stage: test
variables: variables:
target_os_family: "debian" target_os_family: "debian"
target_os: "ubuntu" target_os: "ubuntu"
target_os_version: "18.04" target_os_version: "18.04"
@ -181,7 +182,7 @@ build-and-package-ubuntu-19-04:
<<: *docker <<: *docker
# To run in sequence and save CPU usage, use stage: build_and_package_binaries # To run in sequence and save CPU usage, use stage: build_and_package_binaries
stage: test stage: test
variables: variables:
target_os_family: "debian" target_os_family: "debian"
target_os: "ubuntu" target_os: "ubuntu"
target_os_version: "19.04" target_os_version: "19.04"
@ -189,6 +190,13 @@ build-and-package-ubuntu-19-04:
only: only:
- dev - dev
trigger-webide:
stage: ide
trigger:
include: tools/webide/webide-ci.yml
# Pages are deployed from dev, be careful not to override 'next' # Pages are deployed from dev, be careful not to override 'next'
# in case something gets merged into 'dev' while releasing. # in case something gets merged into 'dev' while releasing.
pages: pages:

View File

@ -66,5 +66,5 @@ deploy-handoff:
variables: variables:
IDE_DOCKER_IMAGE: "registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide" IDE_DOCKER_IMAGE: "registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide"
LIGO_COMMIT_REF_NAME: "${CI_COMMIT_REF_NAME}" LIGO_COMMIT_REF_NAME: "${CI_COMMIT_REF_NAME}"
trigger: jevonearth/ligoweb-deploy trigger: ligolang/ligo-webide-deploy