Skip to content

Commit ae01cb2

Browse files
micossowcursoragent
andcommitted
Use Scala 3.3.x target dirs in CI and Docker.
sbt writes Scala 3 artifacts under scala-3.3.7, not scala-3, so the previous globs missed the JARs. Co-authored-by: Cursor <cursoragent@cursor.com>
1 parent 8cb3917 commit ae01cb2

4 files changed

Lines changed: 16 additions & 12 deletions

File tree

.github/workflows/ci.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -230,8 +230,8 @@ jobs:
230230

231231
- name: Normalize JAR filenames
232232
run: |
233-
cp server/target/scala-3/elasticmq-server-assembly-*.jar server/target/elasticmq-server.jar
234-
cp native-server/target/scala-3/elasticmq-native-server_3-*.jar native-server/target/elasticmq-native-server.jar
233+
cp server/target/scala-*/elasticmq-server-assembly-*.jar server/target/elasticmq-server.jar
234+
cp native-server/target/scala-*/elasticmq-native-server_*.jar native-server/target/elasticmq-native-server.jar
235235
236236
- name: Build JVM docker image
237237
run: docker build -f server/Dockerfile -t softwaremill/elasticmq:local .
@@ -301,11 +301,15 @@ jobs:
301301
env:
302302
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
303303

304+
- name: Normalize assembly path
305+
run: |
306+
cp server/target/scala-*/elasticmq-server-assembly-*.jar "server/target/elasticmq-server-assembly-${{ env.VERSION }}.jar"
307+
304308
- name: Publish assembly jar
305309
uses: actions/upload-release-asset@v1
306310
with:
307311
upload_url: ${{ steps.create_release.outputs.upload_url }}
308-
asset_path: "server/target/scala-3/elasticmq-server-assembly-${{ env.VERSION }}.jar"
312+
asset_path: "server/target/elasticmq-server-assembly-${{ env.VERSION }}.jar"
309313
asset_name: "elasticmq-server-all-${{ env.VERSION }}.jar"
310314
asset_content_type: application/java-archive
311315
env:
@@ -348,8 +352,8 @@ jobs:
348352
- name: Prepare artifacts
349353
run: |
350354
mkdir dist
351-
cp server/target/scala-3/elasticmq-server-assembly-*.jar dist/elasticmq-server.jar
352-
cp native-server/target/scala-3/elasticmq-native-server_3-*.jar dist/elasticmq-native-server.jar
355+
cp server/target/scala-*/elasticmq-server-assembly-*.jar dist/elasticmq-server.jar
356+
cp native-server/target/scala-*/elasticmq-native-server_*.jar dist/elasticmq-native-server.jar
353357
354358
- name: Upload JARs
355359
uses: actions/upload-artifact@v4

AGENTS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ sbt "server/assembly"
6767
sbt "server/docker:publishLocal"
6868

6969
# Run server locally
70-
java -jar server/target/scala-3/elasticmq-server-*.jar
70+
java -jar server/target/scala-3.3.7/elasticmq-server-*.jar
7171
```
7272

7373
### Running ElasticMQ

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -519,12 +519,12 @@ To check the coverage reports:
519519
Although it's mostly only the core project that is relevant for coverage testing, each project's report can be found
520520
in their target directory:
521521

522-
* core/target/scala-3/scoverage-report/index.html
523-
* common-test/target/scala-3/scoverage-report/index.html
524-
* rest/rest-sqs/target/scala-3/scoverage-report/index.html
525-
* server/target/scala-3/scoverage-report/index.html
522+
* core/target/scala-3.3.7/scoverage-report/index.html
523+
* common-test/target/scala-3.3.7/scoverage-report/index.html
524+
* rest/rest-sqs/target/scala-3.3.7/scoverage-report/index.html
525+
* server/target/scala-3.3.7/scoverage-report/index.html
526526

527-
The aggregate report can be found at target/scala-3/scoverage-report/index.html
527+
The aggregate report can be found at target/scala-3.3.7/scoverage-report/index.html
528528

529529
# UI
530530

integration-tests/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN microdnf update -y \
77
RUN mkdir /elasticmq
88
WORKDIR /elasticmq
99

10-
ADD server/target/scala-3/elasticmq-server-assembly-*.jar .
10+
ADD server/target/scala-*/elasticmq-server-assembly-*.jar .
1111

1212
RUN ln -s elasticmq-server-assembly-*.jar elasticmq-server.jar
1313
RUN mkdir /elasticmq/data

0 commit comments

Comments
 (0)