Skip to content

Commit

Permalink
Fix CI upstream tests
Browse files Browse the repository at this point in the history
Remove unnecessary 'gem' packaging during upstream gem installation.

* Bump jruby used for gem installation to 9.2.21.0
  • Loading branch information
abelsromero committed Apr 15, 2023
1 parent fcb8056 commit b7eb3d3
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 34 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ For a detailed view of what has changed, refer to the {url-repo}/commits/main[co

== Unreleased

Build / Infrastructure::

* Fix Asciidoctor upstream CI tests (#1178) (@abelsromero)

== 2.5.8 (2023-04-15)

Improvement::
Expand Down
3 changes: 1 addition & 2 deletions ci/asciidoctor-gem-installer.pom
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
<groupId>rubygems</groupId>
<artifactId>asciidoctor</artifactId>
<version></version>
<packaging>gem</packaging>
<name>Asciidoctor RubyGem Installer</name>
<description>Installs the upstream Asciidoctor RubyGem to the local repository.</description>
<url>http://asciidoctor.org</url>
<url>https://asciidoctor.org</url>
<repositories>
<repository>
<id>rubygems-releases</id>
Expand Down
31 changes: 0 additions & 31 deletions ci/asciidoctor-pdf-gem-installer.pom

This file was deleted.

5 changes: 4 additions & 1 deletion ci/test-asciidoctor-upstream.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,10 @@ sed "s;<version></version>;<version>$ASCIIDOCTOR_VERSION</version>;" pom.xml > p
mv -f pom.xml.sedtmp pom.xml

# we override the jruby version here with one supported by java9, additionally java9 needs some add-opens arguments that need to be ignored on older jvms
mvn install -B --no-transfer-progress -Dgemspec=asciidoctor.gemspec -Djruby.version=9.2.17.0 -Djruby.jvmargs="-XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED"
mvn install -B --no-transfer-progress \
-Dgemspec=asciidoctor.gemspec \
-Djruby.version=9.2.21.0 \
-Djruby.jvmargs="-XX:+IgnoreUnrecognizedVMOptions --add-opens=java.base/java.security.cert=ALL-UNNAMED --add-opens=java.base/java.security=ALL-UNNAMED --add-opens=java.base/java.util.zip=ALL-UNNAMED"
popd

## Test against installed gem
Expand Down

0 comments on commit b7eb3d3

Please sign in to comment.