Merge pull request #82 from it-at-m/release-alpha-of-broadcast-service

Fixes an Workflows in Bezug auf Build von wls-broadcast-service
it-at-m · Apr 12, 2024 · 9875e75 · 9875e75
2 parents 110db39 + ea2cae1
commit 9875e75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/.github/workflows/dispatch-microservice-mvn-release.yml b/.github/workflows/dispatch-microservice-mvn-release.yml
@@ -13,9 +13,6 @@ on:
         required: true
         description: service/directory to build (wls-broadcast-service, ...)
 
-env:
-  gitTag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
-
 jobs:
   run-mvn-release-prepare:
     runs-on: ubuntu-latest
@@ -35,11 +32,11 @@ jobs:
           cache-dependency-path: '${{ github.event.inputs.service }}/pom.xml'
       - name: Perform maven release
         run: >
-          mvn -B -ntp release:prepare -f backend/pom.xml
+          mvn -B -ntp release:prepare -f ${{ github.event.inputs.service }}/pom.xml
           -DreleaseVersion=${{ github.event.inputs.release-version }} 
           -DdevelopmentVersion=${{ github.event.inputs.development-version }} 
-          -Dtag=${{ env.gitTag }}
-          -Darguments="-DskipTests -B -ntp"
+          -Dtag=${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
+          -Darguments="-DskipTests"
 
   build-github-release:
     permissions:
@@ -49,7 +46,7 @@ jobs:
     uses:
       ./.github/workflows/callable-create-github-release-from-tag.yml
     with:
-      tag: ${{ env.gitTag }}
+      tag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
       service: ${{ github.event.inputs.service }}
 
   build-github-container-image:
@@ -60,5 +57,5 @@ jobs:
     uses:
       ./.github/workflows/callable-create-github-container-image.yml
     with:
-      tag: ${{ env.gitTag }}
+      tag: ${{ github.event.inputs.service }}/v${{ github.event.inputs.release-version }}
       service: ${{ github.event.inputs.service }}
diff --git a/wls-broadcast-service/pom.xml b/wls-broadcast-service/pom.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>de.muenchen.oss.wahllokalsystem</groupId>
@@ -378,8 +376,8 @@
                         <eclipse>
                             <file>itm-java-codeformat/java_codestyle_formatter.xml</file>
                         </eclipse>
-                        <trimTrailingWhitespace/>
-                        <endWithNewline/>
+                        <trimTrailingWhitespace />
+                        <endWithNewline />
                     </java>
                 </configuration>
                 <executions>