Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#16 - code style violations in headers #17

Merged
merged 4 commits into from
Jan 20, 2015
Merged

#16 - code style violations in headers #17

merged 4 commits into from
Jan 20, 2015

Conversation

maurezen
Copy link
Contributor

Added license.txt to configuration. Please also note jcabi/jcabi-parent#19

Would be great to remove the inlined configuration after jcabi/jcabi-parent#19 is fixed.
@dmarkov
Copy link

dmarkov commented Jan 15, 2015

Many thanks for the PR, let me find a reviewer for it

@maurezen
Copy link
Contributor Author

@dmarkov any progress with that?

@maurezen
Copy link
Contributor Author

@dmarkov @yegor256 please find someone to review this PR. It's been quite a while.

@dmarkov
Copy link

dmarkov commented Jan 19, 2015

@carlosmiranda please review this one

<!--
@todo #16 Remove this declaration when parent pom would
fix issue jcabi/jcabi-parent#19
-->

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's align this line with line 102 above.

@carlosmiranda
Copy link

@maurezen One minor comment.

@maurezen
Copy link
Contributor Author

@carlosmiranda fixed.

@carlosmiranda
Copy link

@rultor can we merge?

@rultor
Copy link
Contributor

rultor commented Jan 19, 2015

@rultor can we merge?

@carlosmiranda Your .rultor.yml file has a problem:

ScannerException: while scanning a double-quoted scalar
 in 'string', line 30, column 7:
        - "sed 's/<snapshotVersion>.*<\/sn ... 
          ^
found unknown escape character /(47)
 in 'string', line 30, column 36:
        - "sed 's/<snapshotVersion>.*<\/snapshotVersion>/<snapshotVersi ... 
                                       ^

This page explains how to configure it properly. The YAML format is explained here.

yegor256 pushed a commit that referenced this pull request Jan 19, 2015
@yegor256
Copy link
Member

@rultor I fixed config, try to merge again

@rultor
Copy link
Contributor

rultor commented Jan 19, 2015

@rultor I fixed config, try to merge again

@yegor256 This is how I understand the .rultor.yml file in the root directory of this repository:

<?xml version="1.0" encoding="UTF-8"?>
<p>
   <entry key="assets">
      <entry key="settings.xml">yegor256/home#assets/jcabi/settings.xml</entry>
      <entry key="pubring.gpg">yegor256/home#assets/pubring.gpg</entry>
      <entry key="secring.gpg">yegor256/home#assets/secring.gpg</entry>
      <entry key="s3cfg">yegor256/home#assets/s3cfg</entry>
   </entry>
   <entry key="env">
      <entry key="MAVEN_OPTS">-XX:MaxPermSize=256m -Xmx1g</entry>
   </entry>
   <entry key="install">
      <item>sudo gem install pdd</item>
   </entry>
   <entry key="architect">
      <item>yegor256</item>
      <item>dmarkov</item>
   </entry>
   <entry key="merge">
      <entry key="script">mvn clean install -Pqulice --errors --settings ../settings.xml
mvn clean
pdd --source=$(pwd) --verbose --file=/dev/null
</entry>
   </entry>
   <entry key="deploy">
      <entry key="script">mvn clean deploy -Pqulice --errors --settings ../settings.xml
mvn clean
pdd --source=$(pwd) --verbose --file=jcabi-manifests.xml
s3cmd --no-progress put jcabi-manifests.xml --config=../s3cfg s3://pdd.teamed.io/jcabi-manifests.xml
</entry>
   </entry>
   <entry key="release">
      <entry key="script">if [ -n ${snapshot} ]; then
  echo 'Please specify next snapshot version, e.g. @rultor release, tag=`2.0`, snapshot=`2.1-SNAPSHOT`'
  exit 1
fi
mvn versions:set "-DnewVersion=${tag}"
sed -i "s|&lt;snapshotVersion&gt;.*&lt;/snapshotVersion&gt;|&lt;snapshotVersion&gt;${nextSnapshotVersion}&lt;/snapshotVersion&gt;|" pom.xml
git commit -am "${tag}"
mvn clean deploy -Pqulice -Psonatype -Pjcabi --errors --settings ../settings.xml
mvn clean site-deploy -Psite --errors --settings ../settings.xml</entry>
   </entry>
</p>

This page explains how to configure it.

@yegor256
Copy link
Member

@rultor merge it! :)

@rultor
Copy link
Contributor

rultor commented Jan 19, 2015

@rultor merge it! :)

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

@rultor
Copy link
Contributor

rultor commented Jan 19, 2015

@rultor merge it! :)

@yegor256 Oops, I failed. You can see the full log here (spent 3min)

@@ -99,4 +99,27 @@
</plugin>
</plugins>
</build>
<!--
@todo #16 Remove this declaration when parent pom would
fix issue jcabi/jcabi-parent#19

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's add a single space here (f in line 104 should be aligned with t, not @).

@carlosmiranda
Copy link

@maurezen rultor is complaining about puzzle format. Let's fix it (see my latest code comment above)

@maurezen
Copy link
Contributor Author

@carlosmiranda done.

@carlosmiranda
Copy link

@rultor Try the merge again please

@rultor
Copy link
Contributor

rultor commented Jan 20, 2015

@rultor Try the merge again please

@carlosmiranda Thanks for your request. @yegor256 Please confirm this.

@yegor256
Copy link
Member

@rultor merge it

@rultor
Copy link
Contributor

rultor commented Jan 20, 2015

@rultor merge it

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

@rultor rultor merged commit f1a853b into jcabi:master Jan 20, 2015
@rultor
Copy link
Contributor

rultor commented Jan 20, 2015

@rultor merge it

@yegor256 Done! FYI, the full log is here (took me 4min)

@dmarkov
Copy link

dmarkov commented Jan 21, 2015

@carlosmiranda done, I added 20 mins in payment 50570821

added +20 to your rating, now it is equal to +1750

@dmarkov
Copy link

dmarkov commented Jan 21, 2015

@rultor deploy pls

@rultor
Copy link
Contributor

rultor commented Jan 21, 2015

@rultor deploy pls

@dmarkov OK, I'll try to deploy now. You can check the progress here

@rultor
Copy link
Contributor

rultor commented Jan 21, 2015

@rultor deploy pls

@dmarkov Done! FYI, the full log is here (took me 5min)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants