Concourse merge another branch
I'm trying to automate deployments using Concourse-CI.
I have a go application that is checked into a local Gitlab with two branches (master and develop).
I have a pipeline setup for the develop branch that runs go unit tests and if they pass i want to automatically merge the changes from the develop branch to the master branch and tag it with the latest version.
Here is what I have so far:
jobs:
- name: run-unit-tests
public: true
plan:
- get: source-master
- get: source
trigger: true
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
Starting Unit tests for manageGameData
- task: task-unit-tests
file: source/ci/tasks/task-unit-tests.yml
on_success:
do:
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
All Unit tests passed for manageGameData
- put: version
params:
bump: minor
- get: version
- put: source-master
params:
merge: source
repository: source-master
tag: version/number
The problem is that this only tags the master branch with the new version.
Is there a way to merge the develop branch to master?
concourse concourse-git-resource
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
add a comment |
I'm trying to automate deployments using Concourse-CI.
I have a go application that is checked into a local Gitlab with two branches (master and develop).
I have a pipeline setup for the develop branch that runs go unit tests and if they pass i want to automatically merge the changes from the develop branch to the master branch and tag it with the latest version.
Here is what I have so far:
jobs:
- name: run-unit-tests
public: true
plan:
- get: source-master
- get: source
trigger: true
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
Starting Unit tests for manageGameData
- task: task-unit-tests
file: source/ci/tasks/task-unit-tests.yml
on_success:
do:
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
All Unit tests passed for manageGameData
- put: version
params:
bump: minor
- get: version
- put: source-master
params:
merge: source
repository: source-master
tag: version/number
The problem is that this only tags the master branch with the new version.
Is there a way to merge the develop branch to master?
concourse concourse-git-resource
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
1
Is there any part relating to the Go language other than that your repository stores code written in Go? If not, I'd remove that tag from your question.
– Ulrich Eckhardt
Nov 19 '18 at 19:41
I have removed. Thanks.
– AdminTome
Nov 19 '18 at 19:48
add a comment |
I'm trying to automate deployments using Concourse-CI.
I have a go application that is checked into a local Gitlab with two branches (master and develop).
I have a pipeline setup for the develop branch that runs go unit tests and if they pass i want to automatically merge the changes from the develop branch to the master branch and tag it with the latest version.
Here is what I have so far:
jobs:
- name: run-unit-tests
public: true
plan:
- get: source-master
- get: source
trigger: true
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
Starting Unit tests for manageGameData
- task: task-unit-tests
file: source/ci/tasks/task-unit-tests.yml
on_success:
do:
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
All Unit tests passed for manageGameData
- put: version
params:
bump: minor
- get: version
- put: source-master
params:
merge: source
repository: source-master
tag: version/number
The problem is that this only tags the master branch with the new version.
Is there a way to merge the develop branch to master?
concourse concourse-git-resource
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
I'm trying to automate deployments using Concourse-CI.
I have a go application that is checked into a local Gitlab with two branches (master and develop).
I have a pipeline setup for the develop branch that runs go unit tests and if they pass i want to automatically merge the changes from the develop branch to the master branch and tag it with the latest version.
Here is what I have so far:
jobs:
- name: run-unit-tests
public: true
plan:
- get: source-master
- get: source
trigger: true
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
Starting Unit tests for manageGameData
- task: task-unit-tests
file: source/ci/tasks/task-unit-tests.yml
on_success:
do:
- put: discord
params:
channel: "((channel_id))"
color: 6076508
title: Concourse CI
message: |
All Unit tests passed for manageGameData
- put: version
params:
bump: minor
- get: version
- put: source-master
params:
merge: source
repository: source-master
tag: version/number
The problem is that this only tags the master branch with the new version.
Is there a way to merge the develop branch to master?
concourse concourse-git-resource
concourse concourse-git-resource
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
edited Nov 19 '18 at 19:48
AdminTome
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
asked Nov 19 '18 at 19:38
AdminTomeAdminTome
418
418
1
Is there any part relating to the Go language other than that your repository stores code written in Go? If not, I'd remove that tag from your question.
– Ulrich Eckhardt
Nov 19 '18 at 19:41
I have removed. Thanks.
– AdminTome
Nov 19 '18 at 19:48
add a comment |
1
Is there any part relating to the Go language other than that your repository stores code written in Go? If not, I'd remove that tag from your question.
– Ulrich Eckhardt
Nov 19 '18 at 19:41
I have removed. Thanks.
– AdminTome
Nov 19 '18 at 19:48
1
1
Is there any part relating to the Go language other than that your repository stores code written in Go? If not, I'd remove that tag from your question.
– Ulrich Eckhardt
Nov 19 '18 at 19:41
Is there any part relating to the Go language other than that your repository stores code written in Go? If not, I'd remove that tag from your question.
– Ulrich Eckhardt
Nov 19 '18 at 19:41
I have removed. Thanks.
– AdminTome
Nov 19 '18 at 19:48
I have removed. Thanks.
– AdminTome
Nov 19 '18 at 19:48
add a comment |
2 Answers
2
active
oldest
votes
I guess i didn't understand the documentation at first but the answer was pretty easy.
- get: source-master
- get: source
- put: source-master
params:
repository: source
First you have to get both branches in this case master and develop. Then you push the source local repo (a folder on the concourse worker) to master by using put.
There is no need for the merge parameter and i had the wrong repository parameter.
Hope this helps someone else.
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
add a comment |
Alternatively you could use just scripts for more complex git commands.
platform: linux
image_resource:
type: docker-image
source:
repository: concourse/buildroot
tag: git
run:
path: /bin/bash
args:
- -c
- |
set -eux
git clone https://user:passw@devstack.vwgroup.com/bitbucket/scm/~user/kub-api-debug.git
git config --global user.name "UserName"
git config --global user.email "email@accenture.com"
git checkout master
git merge hotfix
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
add a comment |
Your Answer
StackExchange.ifUsing("editor", function () {
StackExchange.using("externalEditor", function () {
StackExchange.using("snippets", function () {
StackExchange.snippets.init();
});
});
}, "code-snippets");
StackExchange.ready(function() {
var channelOptions = {
tags: "".split(" "),
id: "1"
};
initTagRenderer("".split(" "), "".split(" "), channelOptions);
StackExchange.using("externalEditor", function() {
// Have to fire editor after snippets, if snippets enabled
if (StackExchange.settings.snippets.snippetsEnabled) {
StackExchange.using("snippets", function() {
createEditor();
});
}
else {
createEditor();
}
});
function createEditor() {
StackExchange.prepareEditor({
heartbeatType: 'answer',
autoActivateHeartbeat: false,
convertImagesToLinks: true,
noModals: true,
showLowRepImageUploadWarning: true,
reputationToPostImages: 10,
bindNavPrevention: true,
postfix: "",
imageUploader: {
brandingHtml: "Powered by u003ca class="icon-imgur-white" href="https://imgur.com/"u003eu003c/au003e",
contentPolicyHtml: "User contributions licensed under u003ca href="https://creativecommons.org/licenses/by-sa/3.0/"u003ecc by-sa 3.0 with attribution requiredu003c/au003e u003ca href="https://stackoverflow.com/legal/content-policy"u003e(content policy)u003c/au003e",
allowUrls: true
},
onDemand: true,
discardSelector: ".discard-answer"
,immediatelyShowMarkdownHelp:true
});
}
});
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53381510%2fconcourse-merge-another-branch%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
2 Answers
2
active
oldest
votes
2 Answers
2
active
oldest
votes
active
oldest
votes
active
oldest
votes
I guess i didn't understand the documentation at first but the answer was pretty easy.
- get: source-master
- get: source
- put: source-master
params:
repository: source
First you have to get both branches in this case master and develop. Then you push the source local repo (a folder on the concourse worker) to master by using put.
There is no need for the merge parameter and i had the wrong repository parameter.
Hope this helps someone else.
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
add a comment |
I guess i didn't understand the documentation at first but the answer was pretty easy.
- get: source-master
- get: source
- put: source-master
params:
repository: source
First you have to get both branches in this case master and develop. Then you push the source local repo (a folder on the concourse worker) to master by using put.
There is no need for the merge parameter and i had the wrong repository parameter.
Hope this helps someone else.
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
add a comment |
I guess i didn't understand the documentation at first but the answer was pretty easy.
- get: source-master
- get: source
- put: source-master
params:
repository: source
First you have to get both branches in this case master and develop. Then you push the source local repo (a folder on the concourse worker) to master by using put.
There is no need for the merge parameter and i had the wrong repository parameter.
Hope this helps someone else.
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
I guess i didn't understand the documentation at first but the answer was pretty easy.
- get: source-master
- get: source
- put: source-master
params:
repository: source
First you have to get both branches in this case master and develop. Then you push the source local repo (a folder on the concourse worker) to master by using put.
There is no need for the merge parameter and i had the wrong repository parameter.
Hope this helps someone else.
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
answered Nov 21 '18 at 14:56
AdminTomeAdminTome
418
418
add a comment |
add a comment |
Alternatively you could use just scripts for more complex git commands.
platform: linux
image_resource:
type: docker-image
source:
repository: concourse/buildroot
tag: git
run:
path: /bin/bash
args:
- -c
- |
set -eux
git clone https://user:passw@devstack.vwgroup.com/bitbucket/scm/~user/kub-api-debug.git
git config --global user.name "UserName"
git config --global user.email "email@accenture.com"
git checkout master
git merge hotfix
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
add a comment |
Alternatively you could use just scripts for more complex git commands.
platform: linux
image_resource:
type: docker-image
source:
repository: concourse/buildroot
tag: git
run:
path: /bin/bash
args:
- -c
- |
set -eux
git clone https://user:passw@devstack.vwgroup.com/bitbucket/scm/~user/kub-api-debug.git
git config --global user.name "UserName"
git config --global user.email "email@accenture.com"
git checkout master
git merge hotfix
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
add a comment |
Alternatively you could use just scripts for more complex git commands.
platform: linux
image_resource:
type: docker-image
source:
repository: concourse/buildroot
tag: git
run:
path: /bin/bash
args:
- -c
- |
set -eux
git clone https://user:passw@devstack.vwgroup.com/bitbucket/scm/~user/kub-api-debug.git
git config --global user.name "UserName"
git config --global user.email "email@accenture.com"
git checkout master
git merge hotfix
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
Alternatively you could use just scripts for more complex git commands.
platform: linux
image_resource:
type: docker-image
source:
repository: concourse/buildroot
tag: git
run:
path: /bin/bash
args:
- -c
- |
set -eux
git clone https://user:passw@devstack.vwgroup.com/bitbucket/scm/~user/kub-api-debug.git
git config --global user.name "UserName"
git config --global user.email "email@accenture.com"
git checkout master
git merge hotfix
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
answered Mar 5 at 13:06
Janis KarklinsJanis Karklins
96211
96211
add a comment |
add a comment |
Thanks for contributing an answer to Stack Overflow!
- Please be sure to answer the question. Provide details and share your research!
But avoid …
- Asking for help, clarification, or responding to other answers.
- Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
StackExchange.ready(
function () {
StackExchange.openid.initPostLogin('.new-post-login', 'https%3a%2f%2fstackoverflow.com%2fquestions%2f53381510%2fconcourse-merge-another-branch%23new-answer', 'question_page');
}
);
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Sign up or log in
StackExchange.ready(function () {
StackExchange.helpers.onClickDraftSave('#login-link');
});
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Sign up using Google
Sign up using Facebook
Sign up using Email and Password
Post as a guest
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
Required, but never shown
1
Is there any part relating to the Go language other than that your repository stores code written in Go? If not, I'd remove that tag from your question.
– Ulrich Eckhardt
Nov 19 '18 at 19:41
I have removed. Thanks.
– AdminTome
Nov 19 '18 at 19:48