File tree Expand file tree Collapse file tree 2 files changed +7
-16
lines changed
Expand file tree Collapse file tree 2 files changed +7
-16
lines changed Original file line number Diff line number Diff line change @@ -66,7 +66,7 @@ workflows:
6666 - pack_and_validate :
6767 context : CodacyCircleCI
6868 requires :
69- - codacy/checkout_and_version
69+ - codacy/checkout_and_version
7070 - codacy/sbt :
7171 name : populate_cache
7272 cmd : sbt ";set scalafmtUseIvy in ThisBuild := false;update"
@@ -94,9 +94,9 @@ workflows:
9494 requires :
9595 - compile
9696 - codacy/sbt :
97- name : publish
97+ name : package_artifacts
9898 cmd : |
99- sbt ";clean;retrieveGPGKeys;publishSigned;sonatypeRelease "
99+ sbt "assembly "
100100
101101 ./scripts/publish-native.sh -n codacy-coverage-reporter -m com.codacy.CodacyCoverageReporter -t docker $(cat .version)
102102
@@ -113,7 +113,7 @@ workflows:
113113 - master
114114 - publish_circleci_artifacts :
115115 requires :
116- - publish
116+ - package_artifacts
117117 # TODO: Add bintray orb
118118 - codacy/shell :
119119 name : publish_bintray
@@ -127,13 +127,13 @@ workflows:
127127 - master
128128 context : CodacyBintray
129129 requires :
130- - publish
130+ - package_artifacts
131131 - codacy/publish_ghr :
132132 name : publish_ghr
133133 path : ~/workdir/artifacts/
134134 context : CodacyGitHub
135135 requires :
136- - publish
136+ - package_artifacts
137137 - publish_dev :
138138 context : CodacyCircleCI
139139 requires :
Original file line number Diff line number Diff line change @@ -31,21 +31,14 @@ assemblyMergeStrategy in assembly := {
3131 case m if m.toLowerCase.matches(" meta-inf.*\\ .sf$" ) => MergeStrategy .discard
3232 case _ => MergeStrategy .first
3333}
34+ test in assembly := {}
3435crossPaths := false
35- artifact in (Compile , assembly) := {
36- val art = (artifact in (Compile , assembly)).value
37- art.withClassifier(Some (" assembly" ))
38- }
39- addArtifact(artifact in (Compile , assembly), assembly)
4036
4137// HACK: Since we are only using the public resolvers we need to remove the private for it to not fail
4238resolvers ~= {
4339 _.filterNot(_.name.toLowerCase.contains(" codacy" ))
4440}
4541
46- // HACK: This setting is not picked up properly from the plugin
47- pgpPassphrase := Option (System .getenv(" SONATYPE_GPG_PASSPHRASE" )).map(_.toCharArray)
48-
4942description := " CLI to send coverage reports to Codacy through the API"
5043
5144scmInfo := Some (
@@ -55,7 +48,5 @@ scmInfo := Some(
5548 )
5649)
5750
58- publicMvnPublish
59-
6051fork in Test := true
6152cancelable in Global := true
You can’t perform that action at this time.
0 commit comments