Skip to content

Commit da0edb0

Browse files
committed
Move maven jar to expected dist location for plugins which depend upon that
Signed-off-by: Taylor Smock <smocktaylor@gmail.com>
1 parent 9a2c476 commit da0edb0

1 file changed

Lines changed: 3 additions & 7 deletions

File tree

.github/workflows/internal_ant.yml

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,9 @@ jobs:
160160
run: |
161161
cd $GITHUB_WORKSPACE/josm/plugins/${{ inputs.plugin-directory }}
162162
mvn --file ../pom.xml package install --projects org.openstreetmap.josm:josm,org.openstreetmap.josm:josm-unittest -DskipTests
163-
mvn --file pom.xml -Dplugin.version=${{ steps.version.outputs.version }} javadoc:jar sources:jar -DskipTests
163+
mvn --file pom.xml package javadoc:jar source:jar -DskipTests -Dplugin.dist.dir=../../dist -Dplugin.version=${{ steps.version.outputs.version }}
164+
mv target/${{ inputs.plugin-jar-name }}-*-sources.jar ../../dist/${{ inputs.plugin-jar-name }}-sources.jar
165+
mv target/${{ inputs.plugin-jar-name }}-*-javadoc.jar ../../dist/${{ inputs.plugin-jar-name }}-javadoc.jar
164166
165167
- name: Perform attestation
166168
if: ${{ startsWith(github.ref, 'refs/tags/') || inputs.perform-revision-tagging }}
@@ -170,9 +172,6 @@ jobs:
170172
josm/dist/${{ inputs.plugin-jar-name }}.jar
171173
josm/dist/${{ inputs.plugin-jar-name }}-sources.jar
172174
josm/dist/${{ inputs.plugin-jar-name }}-javadoc.jar
173-
josm/distMaven/${{ inputs.plugin-jar-name }}.jar
174-
josm/plugins/${{ inputs.plugin-directory }}/target/${{ inputs.plugin-jar-name }}-*-sources.jar
175-
josm/plugins/${{ inputs.plugin-directory }}/target/${{ inputs.plugin-jar-name }}-*-javadoc.jar
176175
177176
- name: Upload plugin build
178177
id: cache-plugin-build
@@ -183,9 +182,6 @@ jobs:
183182
josm/dist/${{ inputs.plugin-jar-name }}.jar
184183
josm/dist/${{ inputs.plugin-jar-name }}-javadoc.jar
185184
josm/dist/${{ inputs.plugin-jar-name }}-sources.jar
186-
josm/distMaven/${{ inputs.plugin-jar-name }}.jar
187-
josm/plugins/${{ inputs.plugin-directory }}/target/${{ inputs.plugin-jar-name }}-*-sources.jar
188-
josm/plugins/${{ inputs.plugin-directory }}/target/${{ inputs.plugin-jar-name }}-*-javadoc.jar
189185
190186
plugin-test:
191187
runs-on: ${{ inputs.operating-system }}

0 commit comments

Comments
 (0)