Skip to content
This repository has been archived by the owner on Dec 5, 2020. It is now read-only.

Simplified Language class #202

Merged
merged 2 commits into from Mar 23, 2017
Merged

Simplified Language class #202

merged 2 commits into from Mar 23, 2017

Conversation

amihaiemil
Copy link
Member

PR for #155
Commands are now understood based on keywords, not regular expressions -- it's simpler this way, easier to remember and maintain,

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.02%) to 86.835% when pulling c2a68d6 on 155 into fe5559b on master.

@amihaiemil
Copy link
Member Author

@rultor merge please

@rultor
Copy link
Contributor

rultor commented Mar 23, 2017

@rultor merge please

@amihaiemil OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link
Contributor

rultor commented Mar 23, 2017

@rultor merge please

@amihaiemil Oops, I failed. You can see the full log here (spent 10s)

 12:34:03 up 124 days, 18:48,  0 users,  load average: 0.01, 0.08, 0.12
+ fork=git@github.com:opencharles/charles-rest.git
+ fork_branch=155
+ head=git@github.com:opencharles/charles-rest.git
+ head_branch=master
+ pull_id=202
+ pull_title='Simplified Language class'
+ vars=('--env=MAVEN_OPTS=-XX:MaxPermSize=256m -Xmx1g' '--env=fork=git@github.com:opencharles/charles-rest.git' '--env=fork_branch=155' '--env=head=git@github.com:opencharles/charles-rest.git' '--env=head_branch=master' '--env=pull_id=202' '--env=pull_title=Simplified Language class')
+ image=yegor256/rultor
+ directory=
+ scripts=('mvn clean install' ';')
+ squash=false
+ ff=default
+ rebase=false
+ container=opencharles_charles-rest_202
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:opencharles/charles-rest.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'mvn clean install' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'mvn clean install' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:opencharles/charles-rest.git
+ git remote update
Fetching origin
Fetching fork
From github.com:opencharles/charles-rest
 * [new branch]      155        -> fork/155
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/155
error: Your local changes to the following files would be overwritten by checkout:
	src/test/resources/esSearchResponse.json
	src/test/resources/esSearchResponseNoResults.json
Please, commit your changes or stash them before you can switch branches.
Aborting
'cid' file is absent, container wasn't started correctly

@amihaiemil
Copy link
Member Author

@rultor merge please

@rultor
Copy link
Contributor

rultor commented Mar 23, 2017

@rultor merge please

@amihaiemil OK, I'll try to merge now. You can check the progress of the merge here

@rultor
Copy link
Contributor

rultor commented Mar 23, 2017

@rultor merge please

@amihaiemil Oops, I failed. You can see the full log here (spent 10s)

 12:36:35 up 124 days, 18:51,  0 users,  load average: 0.22, 0.16, 0.15
+ fork=git@github.com:opencharles/charles-rest.git
+ fork_branch=155
+ head=git@github.com:opencharles/charles-rest.git
+ head_branch=master
+ pull_id=202
+ pull_title='Simplified Language class'
+ vars=('--env=MAVEN_OPTS=-XX:MaxPermSize=256m -Xmx1g' '--env=fork=git@github.com:opencharles/charles-rest.git' '--env=fork_branch=155' '--env=head=git@github.com:opencharles/charles-rest.git' '--env=head_branch=master' '--env=pull_id=202' '--env=pull_title=Simplified Language class')
+ image=yegor256/rultor
+ directory=
+ scripts=('mvn clean install' ';')
+ squash=false
+ ff=default
+ rebase=false
+ container=opencharles_charles-rest_202
+ as_root=false
+ mkdir -p /home/rultor/.ssh
+ echo -e 'Host github.com\n\tStrictHostKeyChecking no\n'
+ chmod 600 /home/rultor/.ssh/config
+ git clone git@github.com:opencharles/charles-rest.git repo
Cloning into 'repo'...
+ cd repo
+ git config user.email me@rultor.com
+ git config user.name rultor
+ '[' -z 'mvn clean install' ']'
+ cd ..
+ cat
+ '[' false = true ']'
+ cat
+ chmod a+x entry.sh
+ cat
+ echo 'mvn clean install' ';'
+ rm -rf .gpg
+ cd repo
+ git remote add fork git@github.com:opencharles/charles-rest.git
+ git remote update
Fetching origin
Fetching fork
From github.com:opencharles/charles-rest
 * [new branch]      155        -> fork/155
 * [new branch]      gh-pages   -> fork/gh-pages
 * [new branch]      master     -> fork/master
+ args=
+ '[' default == default ']'
+ args=' --ff'
+ '[' default == no ']'
+ '[' default == only ']'
+ export BRANCH=__rultor
+ BRANCH=__rultor
++ git show-branch __rultor
++ wc -l
+ '[' 0 -gt 0 ']'
+ git checkout -B __rultor fork/155
error: Your local changes to the following files would be overwritten by checkout:
	src/test/resources/esSearchResponse.json
	src/test/resources/esSearchResponseNoResults.json
Please, commit your changes or stash them before you can switch branches.
Aborting
'cid' file is absent, container wasn't started correctly

@amihaiemil amihaiemil merged commit 49cc2f8 into master Mar 23, 2017
@amihaiemil amihaiemil deleted the 155 branch March 23, 2017 12:37
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants