wip: Temporary version update

codacy · Mar 16, 2019 · bb72eeb · bb72eeb
1 parent dedb0d2
commit bb72eeb
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 38 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -38,15 +38,6 @@ references:
 
 jobs:
 
-  trigger_test:
-    <<: *default_sbt_job
-    steps:
-      - checkout
-      - *restore_sbt_cache
-      - run:
-          name: Test
-          command: sbt test
-
   checkout_and_version:
     docker:
       - image: codacy/git-version:latest
@@ -129,28 +120,17 @@ jobs:
           command: |
             ./scripts/publish-native.sh -n codacy-coverage-reporter -m com.codacy.CodacyCoverageReporter -t docker $(cat .version)
 
-            cp ~/workdir/codacy-coverage-reporter-linux-$(cat .version) ~/workdir/codacy-coverage-reporter-linux
+            mkdir -p /tmp/binary
+            cp ~/workdir/codacy-coverage-reporter-linux-$(cat .version) /tmp/binary/codacy-coverage-reporter-linux
             curl -fL https://getcli.jfrog.io | sh
             ./jfrog bt config --interactive=false --user codacy-ci --key $BINTRAY_API_KEY
-            ./jfrog bt upload --user codacy-ci --key $BINTRAY_API_KEY --publish $HOME/workdir codacy/Binaries/codacy-coverage-reporter/$(cat .version) codacy-coverage-reporter-linux
+            ./jfrog bt upload --user codacy-ci --key $BINTRAY_API_KEY --publish /tmp/binary/ codacy/Binaries/codacy-coverage-reporter/$(cat .version) codacy-coverage-reporter-linux
 
             go get github.com/tcnksm/ghr
-            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete ${VERSION} ~/workdir/codacy-coverage-reporter-linux-$(cat .version)
+            ghr -t ${GITHUB_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -delete $(cat .version) ~/workdir/codacy-coverage-reporter-linux-$(cat .version)
       - *clean_sbt_cache
       - *save_sbt_cache
 
-  tag_version:
-    <<: *default_sbt_job
-    steps:
-      - attach_workspace:
-          at: ~/
-      - add_ssh_keys:
-          fingerprints:
-            - "df:83:d7:c7:d5:79:06:c2:3b:d1:fd:e2:a3:d1:12:c5"
-      - run:
-          name: Tag
-          command: git tag $(cat .version) && git push --tags
-
 workflows:
   version: 2
 
@@ -180,7 +160,7 @@ workflows:
           requires:
             - compile_and_test
             - checkfmt
-      - publish_native:
+      - publish_binary:
           filters:
             branches:
               only:
@@ -190,12 +170,3 @@ workflows:
           requires:
             - compile_and_test
             - checkfmt
-      - tag_version:
-          filters:
-            branches:
-              only:
-                - master
-                - native-binary
-          context: CodacyAWS
-          requires:
-            - publish
diff --git a/jfrog b/jfrog
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,7 +2,7 @@ import sbt._
 
 object Dependencies {
 
-  val coverageParser = "com.codacy" %% "coverage-parser" % "fixes-SNAPSHOT"
+  val coverageParser = "com.codacy" %% "coverage-parser" % "2.0.14-fixes.acfbcda"
 
   val caseApp = "com.github.alexarchambault" %% "case-app" % "1.2.0"
 

diff --git a/scripts/publish-native.sh b/scripts/publish-native.sh
@@ -93,13 +93,14 @@ function build_cmd() {
 
 echo "Publishing ${APP_NAME} binary version ${VERSION} for ${OS_TARGET}"
 BINARY_NAME="${APP_NAME}-${OS_TARGET}-${VERSION}"
-BUILD_CMD="cd /tmp"
+BUILD_CMD="cd $PWD"
 BUILD_CMD+=" && sed -i 's/^security\.provider/# security\.provider/g' \${JAVA_HOME}/jre/lib/security/java.security"
 # BUILD_CMD+=" && curl -Lq -o \$JAVA_HOME/jre/lib/ext/bcprov-jdk15on-161.jar https://www.bouncycastle.org/download/bcprov-jdk15on-161.jar"
 # BUILD_CMD+=" && echo -e '\nsecurity.provider.1=sun.security.provider.Sun\nsecurity.provider.2=sun.security.rsa.SunRsaSign\nsecurity.provider.3=org.bouncycastle.jce.provider.BouncyCastleProvider\nsecurity.provider.4=com.sun.net.ssl.internal.ssl.Provider\nsecurity.provider.5=com.sun.crypto.provider.SunJCE\nsecurity.provider.6=sun.security.jgss.SunProvider\nsecurity.provider.7=com.sun.security.sasl.Provider\nsecurity.provider.8=org.jcp.xml.dsig.internal.dom.XMLDSigRI\nsecurity.provider.9=sun.security.smartcardio.SunPCSC\n' >> \${JAVA_HOME}/jre/lib/security/java.security"
 BUILD_CMD+=" && echo -e '\nsecurity.provider.1=sun.security.provider.Sun\nsecurity.provider.2=sun.security.rsa.SunRsaSign\nsecurity.provider.3=com.sun.net.ssl.internal.ssl.Provider\nsecurity.provider.4=com.sun.crypto.provider.SunJCE\nsecurity.provider.5=sun.security.jgss.SunProvider\nsecurity.provider.6=com.sun.security.sasl.Provider\nsecurity.provider.7=org.jcp.xml.dsig.internal.dom.XMLDSigRI\nsecurity.provider.8=sun.security.smartcardio.SunPCSC\n' >> \${JAVA_HOME}/jre/lib/security/java.security"
-BUILD_CMD+=" && $(build_cmd ${BINARY_NAME} "${APP_MAIN_CLASS}" "$(app_classpath)")"
-BUILD_CMD+=" && mv $BINARY_NAME $PWD/$BINARY_NAME"
+BUILD_CMD+=" && $(build_cmd ${BINARY_NAME} ${APP_MAIN_CLASS} "$(app_classpath)")"
+
+echo "Going to run ${BUILD_CMD}"
 
 case "$TARGET" in
   native)