Skip to content

Commit

Permalink
task(git_reset_wip): create a commit after reset
Browse files Browse the repository at this point in the history
we ensure a new git history is created after reset (also when no feature
 branches exists)

closes #173
  • Loading branch information
o-orand committed Jul 18, 2018
1 parent 213d3a4 commit 87a70ad
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 0 deletions.
3 changes: 3 additions & 0 deletions concourse/tasks/git_reset_wip.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ run:
for i in $git_br; do echo ${DISPLAY_SEPARATOR};echo "Processing $i";git merge -m "Merge branch '$i' after WIP reset" origin/$i ;done
echo "$(date +'%Y-%m-%d-%H-%M-%S')" | tee .last-reset
git add .last-reset
git commit -m "Add reset timestamp"
params:
GIT_USER_NAME: "Orange Cloud Foundry SKC CI Server"
Expand Down
4 changes: 4 additions & 0 deletions spec/tasks/git_reset_wip/task_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,10 @@
expect(File).not_to exist(File.join(@updated_git_resource, 'a-branch.md'))
end

it 'contains reset timestamp' do
expect(File).to exist(File.join(@updated_git_resource, ".last-reset"))
end

context 'when skip_ssl is enabled' do
it 'does not check ssl certificates' do
expect(@output).to include('Skipping ssl verification')
Expand Down

0 comments on commit 87a70ad

Please sign in to comment.