From f81815e78929c794ec9e1bbb4962ccbdd175d93a Mon Sep 17 00:00:00 2001 From: Deon George Date: Thu, 27 May 2021 09:30:34 +1000 Subject: [PATCH] Alternative attempt to trigger next branch builds --- .gitlab-ci.yml | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0c88b49..50a3dce 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,6 +3,7 @@ image: docker:latest stages: - test - build +- build-next - build-test variables: @@ -43,18 +44,19 @@ x86_64:build: only: - mysql -x86_64:trigger: - stage: build - trigger: - project: $CI_PROJECT_PATH - branch: ext +x86_64:build-next: + stage: build-next + script: + - curl -X POST -F token=${CI_JOB_TOKEN} -F ref=ext ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/trigger/pipeline + only: + - mysql x86_64:build-test: stage: build-test script: - if [ -f init ]; then chmod 500 init; fi - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || true - - docker build --file Dockerfile.phptest --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION}-test . + - docker build --file Dockerfile.phptest --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION}-test . - docker push ${CI_REGISTRY_IMAGE}:${VERSION}-test tags: - docker