Skip to content

Commit bd2f95f

Browse files
committed
Fix jar name to pattern match the new orb filter
Test updated orb
1 parent 33d7f67 commit bd2f95f

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.circleci/config.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ workflows:
243243
sonatypeCentralRelease"
244244
cache_prefix: *cache_prefix
245245
requires:
246-
- publish_docker_locally
246+
- compile
247247
filters:
248248
branches:
249249
only:
@@ -264,14 +264,15 @@ workflows:
264264
openjdk_version: '17'
265265
persist_to_workspace: true
266266
cmd: |
267-
sbt "set codacyAnalysisCli / version := \"$(cat ~/workdir/.version)\";
267+
VERSION=$(cat ~/workdir/.version)
268+
sbt "set codacyAnalysisCli / version := \"$VERSION\";
268269
set assembly / test := {};
269270
codacyAnalysisCli/assembly"
270271
mkdir -p ~/workdir/artifacts/
271-
mv ./cli/target/scala-2.12/codacy-analysis-cli-assembly-$(cat ~/workdir/.version).jar ~/workdir/artifacts/
272+
cp ./cli/target/scala-2.12/codacy-analysis-cli-assembly.jar ~/workdir/artifacts/
272273
cache_prefix: *cache_prefix
273274
requires:
274-
- publish_docker_locally
275+
- compile
275276
filters:
276277
branches:
277278
only:
@@ -282,6 +283,10 @@ workflows:
282283
requires:
283284
- publish_dockerhub
284285
- build_cli_jar
286+
filters:
287+
branches:
288+
only:
289+
- master
285290
- publish_dockerhub_stable_hold:
286291
context: CodacyDocker
287292
type: approval
@@ -302,7 +307,7 @@ workflows:
302307
# nightly:
303308
# triggers:
304309
# - schedule:
305-
# cron: "0 0 * * *" # Every day At minute 00:00
310+
# cron: "0 0 * * *" # Every day "At minute 00:00"
306311
# filters:
307312
# branches:
308313
# only:

build.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ lazy val codacyAnalysisCli = project
6363
publish := (Docker / publish).value,
6464
publishLocal := (Docker / publishLocal).value,
6565
publishArtifact := false,
66+
assembly / assemblyJarName := "codacy-analysis-cli-assembly.jar",
6667
libraryDependencies ++= Dependencies.pprint +: Dependencies.specs2)
6768
.settings(assemblyCommon: _*)
6869
.enablePlugins(JavaAppPackaging)

0 commit comments

Comments
 (0)