Skip to content

Commit

Permalink
remove rpm package from modules
Browse files Browse the repository at this point in the history
  • Loading branch information
SteVio89 committed Mar 15, 2022
1 parent 28153ee commit 61d3f63
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ jobs:
- run:
name: test full
command: |
cd $CIRCLE_WORKING_DIRECTORY && mvn -pl '!languagetool-rpm-package' test -fae
cd $CIRCLE_WORKING_DIRECTORY && mvn test -fae
- save-test-results
- run:
name: deploy full
command: |
cd $CIRCLE_WORKING_DIRECTORY && mvn -s .circleci.settings.xml -pl '!languagetool-rpm-package' -DskipTests deploy
cd $CIRCLE_WORKING_DIRECTORY && mvn -s .circleci.settings.xml -DskipTests deploy
- save_cache:
paths:
- ~/.m2
Expand Down Expand Up @@ -104,7 +104,7 @@ commands:
install-project:
description: Run maven install
steps:
- run: cd $CIRCLE_WORKING_DIRECTORY && mvn -pl '!languagetool-rpm-package' clean install -DskipTests
- run: cd $CIRCLE_WORKING_DIRECTORY && mvn clean install -DskipTests
- run: cd $CIRCLE_WORKING_DIRECTORY && mvn dependency:go-offline
save-test-results:
steps:
Expand Down
6 changes: 3 additions & 3 deletions create_release.sh → deploy_release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -41,17 +41,17 @@ TEST=$2

case "$TEST" in
"fae" | "fn")
COMMAND="mvn -Drevision=$VERSION clean package -$TEST"
COMMAND="mvn -Drevision=$VERSION clean deploy -$TEST"
echo "$COMMAND"
$COMMAND
;;
"none")
COMMAND="mvn -Drevision=$VERSION clean package -DskipTests"
COMMAND="mvn -Drevision=$VERSION clean deploy -DskipTests"
echo "$COMMAND"
$COMMAND
;;
"full")
COMMAND="mvn -Drevision=$VERSION clean package"
COMMAND="mvn -Drevision=$VERSION clean deploy"
echo "$COMMAND"
$COMMAND
;;
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@
<module>languagetool-http-client</module>
<module>languagetool-tools</module>
<module>languagetool-dev</module>
<module>languagetool-rpm-package</module>
<!-- <module>languagetool-rpm-package</module>-->
<!-- don't add languagetool-client-example here, it's built manually only -->
</modules>
</project>
2 changes: 1 addition & 1 deletion test-modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ PROJECTS=""
TEST_COMMAND=""

if grep -q -e "languagetool-core/.*" /home/circleci/git_diffs.txt; then
TEST_COMMAND=(mvn clean --projects '!languagetool-rpm-package' --also-make -fae test)
TEST_COMMAND=(mvn clean --also-make -fae test)
else
if grep -q -e "languagetool-commandline/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-commandline,$PROJECTS"; fi
if grep -q -e "languagetool-dev/.*" /home/circleci/git_diffs.txt; then PROJECTS="languagetool-dev,$PROJECTS"; fi
Expand Down

0 comments on commit 61d3f63

Please sign in to comment.