diff --git a/.travis.yml b/.travis.yml index be2b4b5..ee3e272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,6 +23,9 @@ after_success: - java -jar -DACCOUNT_USER=$ACCOUNT_USER ${DEPLOYER_JAR_FILE:-} --icsDirectory /var/tmp/schedule/ --apiKey icalToGoogleDeployment/src/test/resources/client_secrets_apiKey.json -log INFO +- make createPdf +- zip -r postProcess.zip /var/tmp/schedule +- cp /var/tmp/schedule/allEvents.pdf . before_deploy: - git config --global user.email "builds@travis-ci.com" - git config --global user.name "Travis CI" @@ -30,8 +33,8 @@ before_deploy: - git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER" - git push -q https://${BLUB}@github.com/rogerGunis/schedule2ics --tags after_deploy: -- test -f postProcess/${CALENDAR} && jobService/src/main/resources/WithPostProcessing/bin/IcsFileSync.sh - postProcess/${CALENDAR} +- test -f /var/tmp/schedule/${CALENDAR} && jobService/src/main/resources/WithPostProcessing/bin/IcsFileSync.sh + /var/tmp/schedule/${CALENDAR} deploy: skip_cleanup: true provider: releases @@ -41,7 +44,7 @@ deploy: file_glob: true file: - postProcess.zip - - postProcess/allEvents.pdf + - allEvents.pdf on: repo: rogerGunis/schedule2ics branches: diff --git a/Makefile b/Makefile index 4fa0c4a..a116a74 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,7 @@ geschwisterTag: createPdf: bash /var/tmp/schedule/allEvents.sh +viewPdf: pdftk /var/tmp/schedule/allEvents.pdf cat 3-end output /var/tmp/schedule/allEvents.cut.pdf pdf: compile build2 rmPdf geschwisterTag createPdf view @@ -59,10 +60,10 @@ build2: --holidays ./jobService/src/main/resources/WithPostProcessing/inputData/Holidays.csv -log ALL --withPostprocessing travis: compile build2 geschwisterTag createPdf - zip -r postProcess.zip postProcess + zip -r postProcess.zip /var/tmp/schedule mkdir -p .store java -jar -DACCOUNT_USER=$$ACCOUNT_USER $$(find . -name "icalToGoogleDeployment*.jar") \ - --icsDirectory postProcess \ + --icsDirectory /var/tmp/schedule \ --apiKey icalToGoogleDeployment/src/test/resources/client_secrets_apiKey.json \ -log INFO