Skip to content

Commit

Permalink
Merge pull request #50 from scylladb/dk/java-add-check-deploy-step
Browse files Browse the repository at this point in the history
JAVA: test docs publish step
  • Loading branch information
dkropachev authored Jan 10, 2025
2 parents 3787787 + d791cc2 commit 7da57b8
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 13 deletions.
7 changes: 6 additions & 1 deletion .github/workflows/continuous-integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ on:
jobs:
compile:
name: Compile Java Module
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
defaults:
run:
working-directory: ./java
Expand All @@ -23,6 +23,11 @@ jobs:
distribution: temurin
java-version: 8
cache: maven
server-id: ossrh
server-username: MAVEN_USERNAME
server-password: MAVEN_CENTRAL_TOKEN
gpg-private-key: ${{ secrets.MAVEN_GPG_PRIVATE_KEY }}
gpg-passphrase: MAVEN_GPG_PASSPHRASE

- name: Compile Tests
run: make compile compile-test
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/publish-java-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ on:
required: true
type: string

env:
IS_CICD: 1

jobs:
compile:
name: Publish the Java Package to Maven Central
Expand Down
27 changes: 16 additions & 11 deletions java/Makefile
Original file line number Diff line number Diff line change
@@ -1,20 +1,25 @@
mvn = mvn

ifdef IS_CICD
mvn = mvn --no-transfer-progress
endif


clean:
mvn clean
$mvn clean

verify:
mvn verify
mvn javadoc:test-javadoc
mvn javadoc:test-aggregate
mvn javadoc:test-jar
mvn javadoc:test-resource-bundle
${mvn} verify
${mvn} javadoc:test-javadoc javadoc:test-aggregate javadoc:test-aggregate-jar javadoc:test-jar javadoc:test-resource-bundle
${mvn} javadoc:jar javadoc:aggregate javadoc:aggregate-jar javadoc:resource-bundle

fix:
mvn com.coveo:fmt-maven-plugin:format
echo y | mvn javadoc:fix
echo y | mvn javadoc:test-fix
${mvn} com.coveo:fmt-maven-plugin:format
echo y | ${mvn} javadoc:fix
echo y | ${mvn} javadoc:test-fix

compile:
mvn compile
${mvn} compile

compile-test:
mvn test-compile
${mvn} test-compile
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ public void checkIfRackAndDatacenterSetCorrectly() throws FailedToCheck, Validat
}

/**
* Returns true if remote node supports /localnodes?rack=\<\>\&dc=\<datacenter\>. If it can't
* Returns true if remote node supports /localnodes?rack=`rack`&amp;dc=`datacenter`. If it can't
* conclude by any reason it throws {@link
* com.scylladb.alternator.AlternatorLiveNodes.FailedToCheck}
*
Expand Down

0 comments on commit 7da57b8

Please sign in to comment.