From 74198fd61f1955e5796bb6f298f902dfdc094d3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jev=20Bj=C3=B6rsell?= Date: Fri, 7 Feb 2020 08:09:05 -0800 Subject: [PATCH 1/3] Add trigger to kick off the webide child ci pipeline --- .gitlab-ci.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dfd014a85..73e26e8b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,6 +7,7 @@ variables: stages: - test + - ide - build_and_package_binaries - build_docker - build_and_deploy_docker @@ -141,7 +142,7 @@ build-and-package-debian-9: <<: *docker # To run in sequence and save CPU usage, use stage: build_and_package_binaries stage: test - variables: + variables: target_os_family: "debian" target_os: "debian" target_os_version: "9" @@ -153,7 +154,7 @@ build-and-package-debian-10: <<: *docker # To run in sequence and save CPU usage, use stage: build_and_package_binaries stage: test - variables: + variables: target_os_family: "debian" target_os: "debian" target_os_version: "10" @@ -169,7 +170,7 @@ build-and-package-ubuntu-18-04: <<: *docker # To run in sequence and save CPU usage, use stage: build_and_package_binaries stage: test - variables: + variables: target_os_family: "debian" target_os: "ubuntu" target_os_version: "18.04" @@ -181,7 +182,7 @@ build-and-package-ubuntu-19-04: <<: *docker # To run in sequence and save CPU usage, use stage: build_and_package_binaries stage: test - variables: + variables: target_os_family: "debian" target_os: "ubuntu" target_os_version: "19.04" @@ -189,6 +190,13 @@ build-and-package-ubuntu-19-04: only: - dev + +trigger-webide: + stage: ide + trigger: + include: tools/webide/webide-ci.yml + + # Pages are deployed from dev, be careful not to override 'next' # in case something gets merged into 'dev' while releasing. pages: From 613d7309c1237b9bad83a6b1d8a471725c0ec5a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jev=20Bj=C3=B6rsell?= Date: Fri, 7 Feb 2020 08:30:58 -0800 Subject: [PATCH 2/3] Update trigger to point to new private deploy repo. --- tools/webide/webide-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/webide/webide-ci.yml b/tools/webide/webide-ci.yml index af2364e74..3f7d68731 100644 --- a/tools/webide/webide-ci.yml +++ b/tools/webide/webide-ci.yml @@ -66,5 +66,5 @@ deploy-handoff: variables: IDE_DOCKER_IMAGE: "registry.gitlab.com/${CI_PROJECT_PATH}/ligo_webide" LIGO_COMMIT_REF_NAME: "${CI_COMMIT_REF_NAME}" - trigger: jevonearth/ligoweb-deploy + trigger: ligolang/ligo-webide-deploy From bffa1585b02358002fb43a23f553a6e63a7ddd6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jev=20Bj=C3=B6rsell?= Date: Fri, 7 Feb 2020 09:14:50 -0800 Subject: [PATCH 3/3] Fix docker tag to use default docker hub registry Follow the same logic as `scripts/build_docker_image.sh` This could use some further refactoring simplification. --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 73e26e8b9..fc95f2f4b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -132,7 +132,7 @@ build-and-publish-latest-docker-image: - sh scripts/build_docker_image.sh - sh scripts/test_cli.sh - 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: - dev