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.

Sign up for GitHub

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

Java edits for kb-sdk 1.3 #350

Merged
merged 9 commits into from
Jun 19, 2020
Merged

Java edits for kb-sdk 1.3 #350

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
35e7479
Whitespace changes only: removing trailing spaces, replacing tabs wit…
ialarmedalien Jun 11, 2020
8d0e981
Typo in error message
ialarmedalien Jun 11, 2020
2a7474a
Adding build date/time to kb-sdk. Failing earlier in kb-sdk test.
ialarmedalien Jun 11, 2020
7e58f55
Adding actions file
ialarmedalien Jun 11, 2020
835b9cc
Adding in Java example generate/test to github actions; DRYing out re…
ialarmedalien Jun 12, 2020
9ac1aba
Updating actions to create a build/test matrix. Report version when s…
ialarmedalien Jun 16, 2020
2384e3b
Updating release notes with more specific details
ialarmedalien Jun 17, 2020
48f8e29
Reworded release notes message.
ialarmedalien Jun 17, 2020
c3e81fb
Die if the git.properties file cannot be found
ialarmedalien Jun 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 46 additions & 0 deletions .github/workflows/kb_sdk-actions.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: Basic kb-sdk tests
ialarmedalien marked this conversation as resolved.
Show resolved Hide resolved

on:
[push, pull_request]

jobs:

docker_build_and_test:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Set up JDK 1.8
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Add bin to $PATH
run: |
env
echo "::add-path::$GITHUB_WORKSPACE/bin"
- name: Build with Ant
run: |
make
env
- name: checking kb-sdk functions
env:
KBASE_TEST_TOKEN: ${{ secrets.KBASE_TEST_TOKEN }}
run: |
kb-sdk help
kb-sdk version
kb-sdk init -l perl -u user PerlBase
cd PerlBase
kb-sdk test
cd ..
rm -rf PerlBase
kb-sdk init -l perl -u user --example PerlExample
cd PerlExample
kb-sdk test
cd ..
rm -rf PerlExample
kb-sdk init -l python -u user --example MyContigFilter
cd MyContigFilter
make
kb-sdk test
cd ..
ialarmedalien marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 0 additions & 2 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,3 @@ script:
- cd MyContigFilter
- make
- kb-sdk validate


2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ bin: jars-submodule-init
echo '#!/bin/bash' > bin/kb-sdk
echo 'DIR=$(DIR)' >> bin/kb-sdk
echo 'KBASE_JARS_DIR=$$DIR/submodules/jars/lib/jars' >> bin/kb-sdk
@# Next command processes links in JAR_DEPS_BIN file and has 5 parts (one on each line):
@# Next command processes links in JAR_DEPS_BIN file and has 5 parts (one on each line):
@# (1) removing comments
@# (2) trimming each line (picking first word actually)
@# (3) skipping empty lines
Expand Down
9 changes: 5 additions & 4 deletions build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
</condition>
<!-- Properties in ant are immutable, so the following assignment will only take place if jardir was not set above. -->
<property name="jardir" location="${env.JENKINS_JARS_MODULE_PATH}/lib/jars"/>

<!-- KBASE_COMMON_JAR should come from Makefile because of "make bin" mode support -->
<condition property="commonjar" value="${KBASE_COMMON_JAR}">
<and>
Expand Down Expand Up @@ -102,7 +102,7 @@
</target>



<tstamp/>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Timestamp

<target name="compile" depends="init" description="compile the source">
<fail message="KBase common jar is not set">
<condition>
Expand All @@ -116,7 +116,8 @@
<echo file="${src}/us/kbase/mobu/git.properties">### PLEASE DO NOT CHANGE THIS FILE MANUALLY! ###
giturl=${git.url}
branch=${git.branch}
commit=${git.commit}</echo>
commit=${git.commit}
build_timestamp=${DSTAMP}-${TSTAMP}</echo>
Copy link
Collaborator Author

Choose a reason for hiding this comment

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

add date and time to the git.properties file

<echo>Compiling with jar directory: ${jardir}</echo>
<javac destdir="${classes}" srcdir="${src}" includeantruntime="false" debug="true" classpathref="compile.classpath" target="1.7" source="1.7" />
<!-- Copy resource files-->
Expand Down Expand Up @@ -205,7 +206,7 @@ echo $pid > $DIR/pid.txt
</echo>
<chmod file="${ee.dir}/${ee.start.script}" perm="a+x"/>
<echo>Successfully built: ${ee.dir}/${ee.start.script}</echo>

<echo file="${ee.dir}/${ee.stop.script}">#!/bin/bash
DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" &amp;&amp; pwd )
kill $(&lt;"$DIR/pid.txt")
Expand Down
Loading