Skip to content

Commit

Permalink
Switch GHA from Ant to Gradle
Browse files Browse the repository at this point in the history
  • Loading branch information
MrCreosote committed Feb 18, 2024
1 parent 26836a8 commit 4fa042b
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 8 deletions.
1 change: 0 additions & 1 deletion .codecov.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,4 @@ comment:
require_changes: no

ignore:
- "build"
- "deployment"
6 changes: 2 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,11 @@ jobs:
mongo: 'mongodb-linux-x86_64-3.6.23'
minio: '2019-05-23T00-29-34Z'
wired_tiger: 'true'
ant_test: 'test_quick_coverage'
# the current production setup
- java: '11'
mongo: 'mongodb-linux-x86_64-3.6.13'
minio: '2019-05-23T00-29-34Z'
wired_tiger: 'false'
ant_test: 'test_quick_coverage'
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -84,6 +82,7 @@ jobs:
# move to parent dir of homedir to install binaries etc
cd ..
# TODO Remove after updating auth controller to fat jar
# set up jars
git clone https://github.com/kbase/jars
export JARSDIR=$(pwd)/jars/lib/jars/
Expand Down Expand Up @@ -153,8 +152,7 @@ jobs:
- name: Run tests
shell: bash
run: |
ant javadoc
ant ${{matrix.ant_test}}
./gradlew testQuick
- name: Upload coverage to Codecov
uses: codecov/codecov-action@v3
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ plugins {

// TODO NOW test fat jar works in groups
// TODO NOW get rid of all mention of the jars repo - need auth fat jar
// TODO NOW get docserver working in WAR and test in docker
// TODO NOW client jar
// TODO NOW client jar javadoc - needs java_common source
// TODO NOW get docserver working in WAR and test in docker - compare docs to CI docs incl client javadoc
// TODO NOW client jar
// TODO NOW schema updater script
// TODO NOW sdk-compile all, java, and docs
// TODO NOW handle the git commit the same way as auth does
Expand Down Expand Up @@ -106,7 +106,7 @@ sourceSets {

javadoc {
options {
links "http://download.oracle.com/javase/11/docs/api/"
links "https://docs.oracle.com/en/java/javase/11/docs/api/"
links "https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-core/2.9.9/"
links "https://www.javadoc.io/doc/com.fasterxml.jackson.core/jackson-databind/2.9.9/"
}
Expand Down

0 comments on commit 4fa042b

Please sign in to comment.