diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 8ab0c2b..eddfceb 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -37,12 +37,13 @@ meta: secret_key: (( param "Please set your AWS Secret Key ID" )) github: - uri: (( concat "git@github.com:" meta.github.owner "/" meta.github.repo )) - owner: (( param "Please specify the name of the user / organization that owns the Github repository" )) - repo: (( param "Please specify the name of the Github repository" )) - branch: master - private_key: (( param "Please generate an SSH Deployment Key for this repo and specify it here" )) - access_token: (( param "Please generate a Personal Access Token and specify it here" )) + uri: (( concat "git@github.com:" meta.github.owner "/" meta.github.repo )) + owner: (( param "Please specify the name of the user / organization that owns the Github repository" )) + repo: (( param "Please specify the name of the Github repository" )) + branch: master + pr_base_branch: (( grab meta.github.branch )) + private_key: (( param "Please generate an SSH Deployment Key for this repo and specify it here" )) + access_token: (( param "Please generate a Personal Access Token and specify it here" )) dockerhub: username: (( param "Please specify the username for your Dockerhub account" )) @@ -355,7 +356,7 @@ resources: source: access_token: (( grab meta.github.access_token )) repository: (( concat meta.github.owner "/" meta.github.repo )) - base_branch: (( grab meta.github.branch )) + base_branch: (( grab meta.github.pr_base_branch )) - name: docker-image-build-task type: registry-image